diff --git a/.gitignore b/.gitignore index 5ff6309..2bbaed7 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ target/ .idea/jarRepositories.xml .idea/compiler.xml .idea/libraries/ +.idea/misc.xml +.idea/sqldialects.xml *.iws *.iml *.ipr diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegHospital.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegHospital.java index e0034eb..941b2dc 100644 --- a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegHospital.java +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegHospital.java @@ -37,4 +37,5 @@ public class RegHospital extends BaseEntity { @Excel(name = "状态", readConverterExp = "0=正常,1=停用") private String status; private String hospital_type; + private String dept; } diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegPatMain.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegPatMain.java new file mode 100644 index 0000000..c39a5b8 --- /dev/null +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegPatMain.java @@ -0,0 +1,65 @@ +package com.transitPlatForm.common.core.domain.entity.reg; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RegPatMain { + private String ReportNo; + private String HospCode; + private String HospName; + private String PatId; + private String PatCardType; + private String PatCardNo; + private String PatType; + private String RegNo; + private String PatName; + private String PatSex; + private String PatAge; + private String AgeUnit; + private Date PatBirthday; + private String PatIdentity; + private String Phone; + private String Address; + private String PatFeeType; + private String DepartCode; + private String DepartName; + private String AreaCode; + private String AreaName; + private String PatBed; + private String DiagnosisCode; + private String DiagnosisName; + private String OrderPatId; + private String OrderUserCode; + private String OrderUserName; + private Date OrderTime; + private String SrcHospCode; + private String SrcHospName; + private String Barcode; + private String TubeCode; + private String TubeName; + private String SampleTypeCode; + private String SampleTypeName; + private String IsER; + private String OrderItemCodes; + private String OrderItemNames; + private Date CollectDate; + private Date SignInDate; + private Date TestDate; + private Date ReportTime; + private String ReportUserCode; + private String ReportUserName; + private String SampleTrait; + private String ReportKindCode; + private String ReportKindName; + private String ReportDescrpt; + private String LisGroupCode; + private String LisGroupName; + private String DstHospCode; + private String DstHospName; +} diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegReportFile.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegReportFile.java new file mode 100644 index 0000000..7732978 --- /dev/null +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegReportFile.java @@ -0,0 +1,22 @@ +package com.transitPlatForm.common.core.domain.entity.reg; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RegReportFile { + private String ReportNo; + private String ReportFileName; + private String ReportFormat; + private String Report; + private String HospCode; + private String HospName; + private Date OperateTime; + private String UserCode; + private String UserName; +} diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegResult.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegResult.java new file mode 100644 index 0000000..6d83980 --- /dev/null +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegResult.java @@ -0,0 +1,54 @@ +package com.transitPlatForm.common.core.domain.entity.reg; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RegResult { + private String ReportNo; + private String PatId; + private String HospCode; + private String HospName; + private String ItemResultNo; + private Date TestTime; + private String TestUserCode; + private String TestUserName; + private Date AuditTime; + private String AuditUserCode; + private String AuditUserName; + private String ItemCode; + private String ItemName; + private String ItemNameCn; + private String ItemCodeSB; + private String ItemNameSB; + private String Lonic; + private String ItemMethodCode; + private String ItemMethodName; + private String EquipmentCode; + private String TestInstCode; + private String TestInstCodeSB; + private String TestInstName; + private BigDecimal ItemResult; + private String ItemResultText; + private String ResultRemark; + private String ItemUnit; + private String ItemRef; + private String ItemRefMin; + private String ItemRefMax; + private String ItemFlag; + private String ItemFlagStr; + private String CheckFlag; + private String CrtFlag; + private String CrtRef; + private String OrderItemCode; + private String OrderItemName; + private String PrintSort; + + +} diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegResultGerm.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegResultGerm.java new file mode 100644 index 0000000..7937633 --- /dev/null +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegResultGerm.java @@ -0,0 +1,39 @@ +package com.transitPlatForm.common.core.domain.entity.reg; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RegResultGerm { + private String ReportNo; + private String PatId; + private String HospCode; + private String HospName; + private String GermResultNo; + private String GermCode; + private String GermName; + private String GermNameCn; + private String GermCodeSB; + private String GermNameSB; + private String ColonyCounting; + private String ColonyRatio; + private String MediumName; + private String CultureTime; + private String CultureNeed; + private String DiscoveryMode; + private String EquipmentCode; + private String TestInstCode; + private String TestInstCodeSB; + private String TestInstName; + private String TestResult; + private String ItemResultText; + private String IsMultidrugR; + private String MultidrugRName; + private String CrtFlag; + private String IsInfectious; + private String IsBiohazard; + private String PrintSort; +} diff --git a/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegResultMed.java b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegResultMed.java new file mode 100644 index 0000000..9d282e5 --- /dev/null +++ b/pf_common/src/main/java/com/transitPlatForm/common/core/domain/entity/reg/RegResultMed.java @@ -0,0 +1,35 @@ +package com.transitPlatForm.common.core.domain.entity.reg; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.math.BigDecimal; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RegResultMed { + private String ReportNo; + private String PatId; + private String HospCode; + private String HospName; + private String SensResultNo; + private String GermResultNo; + private String AntiCode; + private String AntiName; + private String AntiNameCn; + private String AntiCodeSB; + private String AntiNameSB; + private String TestMethodCode; + private String TestMethodName; + private String TestResult; + private String ResistantCode; + private String ResistantName; + private String ItemRef; + private BigDecimal Dosage; + private String Mic; + private BigDecimal DiameterOfInhibitionRing; + private String SensRemark; + private String PrintSort; +} diff --git a/pf_system/src/main/java/com/transitPlatForm/system/mapper/SysDeptMapper.java b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/SysDeptMapper.java similarity index 98% rename from pf_system/src/main/java/com/transitPlatForm/system/mapper/SysDeptMapper.java rename to pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/SysDeptMapper.java index 6b4cafe..1679cc2 100644 --- a/pf_system/src/main/java/com/transitPlatForm/system/mapper/SysDeptMapper.java +++ b/pf_interfaceCommon/src/main/java/com/transitPlatForm/interfaceCommon/mapper/SysDeptMapper.java @@ -1,4 +1,4 @@ -package com.transitPlatForm.system.mapper; +package com.transitPlatForm.interfaceCommon.mapper; import java.util.List; diff --git a/pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml b/pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml index 345b09d..ea0b314 100644 --- a/pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml +++ b/pf_interfaceCommon/src/main/resources/mapper/RegHospitalMapper.xml @@ -15,10 +15,11 @@ + - select hospital_id, hospital_code, hospital_name, hospital_userinfo, status, create_by, create_time, remark,hospital_type + select hospital_id, hospital_code, hospital_name, hospital_userinfo, status, create_by, create_time, remark,hospital_type,dept from Reg_hospital @@ -34,6 +35,9 @@ AND hospital_name like '%'+#{hospitalName}+'%' + + AND dept = #{dept} + @@ -70,6 +74,7 @@ hospital_type = #{hospital_type}, status = #{status}, remark = #{remark}, + dept = #{dept}, update_by = #{updateBy}, update_time = getdate() @@ -85,6 +90,7 @@ remark, hospital_type, create_by, + dept, create_time )values( #{hospitalCode}, @@ -94,6 +100,7 @@ #{remark}, #{hospital_type}, #{createBy}, + #{dept}, getdate() ) diff --git a/pf_system/src/main/resources/mapper/system/SysDeptMapper.xml b/pf_interfaceCommon/src/main/resources/mapper/SysDeptMapper.xml similarity index 96% rename from pf_system/src/main/resources/mapper/system/SysDeptMapper.xml rename to pf_interfaceCommon/src/main/resources/mapper/SysDeptMapper.xml index 42950d7..b90a1c9 100644 --- a/pf_system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/pf_interfaceCommon/src/main/resources/mapper/SysDeptMapper.xml @@ -2,7 +2,7 @@ - + @@ -88,9 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' - + insert into sys_dept( - dept_id, parent_id, dept_name, ancestors, @@ -102,7 +101,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" create_by, create_time )values( - #{deptId}, #{parentId}, #{deptName}, #{ancestors}, diff --git a/pf_system/src/main/java/com/transitPlatForm/system/service/impl/SysDeptServiceImpl.java b/pf_system/src/main/java/com/transitPlatForm/system/service/impl/SysDeptServiceImpl.java index 43247ef..d1620fc 100644 --- a/pf_system/src/main/java/com/transitPlatForm/system/service/impl/SysDeptServiceImpl.java +++ b/pf_system/src/main/java/com/transitPlatForm/system/service/impl/SysDeptServiceImpl.java @@ -11,7 +11,7 @@ import com.transitPlatForm.common.exception.ServiceException; import com.transitPlatForm.common.utils.SecurityUtils; import com.transitPlatForm.common.utils.StringUtils; import com.transitPlatForm.common.utils.spring.SpringUtils; -import com.transitPlatForm.system.mapper.SysDeptMapper; +import com.transitPlatForm.interfaceCommon.mapper.SysDeptMapper; import com.transitPlatForm.system.mapper.SysRoleMapper; import com.transitPlatForm.system.service.ISysDeptService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/pf_system/src/main/java/com/transitPlatForm/system/web/controller/system/SysUserController.java b/pf_system/src/main/java/com/transitPlatForm/system/web/controller/system/SysUserController.java index b640d63..b80a779 100644 --- a/pf_system/src/main/java/com/transitPlatForm/system/web/controller/system/SysUserController.java +++ b/pf_system/src/main/java/com/transitPlatForm/system/web/controller/system/SysUserController.java @@ -8,11 +8,13 @@ import com.transitPlatForm.common.core.domain.Result; import com.transitPlatForm.common.core.domain.entity.SysDept; import com.transitPlatForm.common.core.domain.entity.SysRole; import com.transitPlatForm.common.core.domain.entity.SysUser; +import com.transitPlatForm.common.core.domain.entity.reg.RegHospital; import com.transitPlatForm.common.core.page.TableDataInfo; import com.transitPlatForm.common.enums.BusinessType; import com.transitPlatForm.common.utils.SecurityUtils; import com.transitPlatForm.common.utils.StringUtils; import com.transitPlatForm.common.utils.poi.ExcelUtil; +import com.transitPlatForm.interfaceCommon.mapper.RegHospitalMapper; import com.transitPlatForm.system.service.ISysDeptService; import com.transitPlatForm.system.service.ISysPostService; import com.transitPlatForm.system.service.ISysRoleService; @@ -50,6 +52,8 @@ public class SysUserController extends BaseController { @Autowired private ISysPostService postService; + @Autowired + private RegHospitalMapper regHospitalMapper; /** * 获取用户列表 @@ -127,6 +131,12 @@ public class SysUserController extends BaseController { } user.setCreateBy(getUsername()); user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); + RegHospital regHospital = new RegHospital(); + regHospital.setDept(user.getDept().toString()); + List regHospitalList = regHospitalMapper.selectHospitalList(regHospital); + if(regHospitalList.size() <= 0) return error("没有找到机构ID"); + String yljg = regHospitalList.get(0).getHospitalId().toString(); + user.setYljg(yljg); return toAjax(userService.insertUser(user)); } diff --git a/pf_system/src/main/resources/mapper/system/SysUserMapper.xml b/pf_system/src/main/resources/mapper/system/SysUserMapper.xml index d2c62ae..a0ace12 100644 --- a/pf_system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/pf_system/src/main/resources/mapper/system/SysUserMapper.xml @@ -152,7 +152,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sys_user( - user_id, dept_id, user_name, nick_name, @@ -164,9 +163,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" status, create_by, remark, + yljg, create_time )values( - #{userId}, #{deptId}, #{userName}, #{nickName}, @@ -178,6 +177,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{status}, #{createBy}, #{remark}, + #{yljg}, getdate() ) @@ -197,6 +197,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" login_date = #{loginDate}, update_by = #{updateBy}, remark = #{remark}, + yljg = #{yljg}, update_time = getdate() where user_id = #{userId} diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java index d71b2bf..7ab4847 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/controller/RegRequestInfoController.java @@ -3,6 +3,7 @@ package com.transitPlatForm.transitPF.controller; import com.transitPlatForm.common.annotation.Log; import com.transitPlatForm.common.core.controller.BaseController; import com.transitPlatForm.common.core.domain.Result; +import com.transitPlatForm.common.core.domain.entity.reg.RegApply; import com.transitPlatForm.common.enums.BusinessType; import com.transitPlatForm.interfaceCommon.constants.SysLogConstants; import com.transitPlatForm.transitPF.pojo.DTO.reqinfo.RegRequestInfoDTO; @@ -99,5 +100,11 @@ public class RegRequestInfoController extends BaseController { return regRequestInfoService.printcheck(); } + @ApiOperation("获取病人信息") + @GetMapping("/patInfo") + public Result getPatInfo(RegRequestInfoDTO regRequestInfoDTO){ + return regRequestInfoService.getPatInfo(regRequestInfoDTO); + } + } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegRequestInfoMapper.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegRequestInfoMapper.java index 1c2e944..870f635 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegRequestInfoMapper.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegRequestInfoMapper.java @@ -17,4 +17,6 @@ public interface RegRequestInfoMapper { List> getItemInfo(String hospitalType); List existSQD(@Param("applyId") String applyId, @Param("applyDetailId") String applyDetailId); + + RegApply getPatInfo(@Param("patId")String patId,@Param("srcHospCode") String srcHospCode); } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegResultMapper.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegResultMapper.java new file mode 100644 index 0000000..0d9414b --- /dev/null +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/mapper/RegResultMapper.java @@ -0,0 +1,16 @@ +package com.transitPlatForm.transitPF.mapper; + +import com.transitPlatForm.common.core.domain.entity.reg.*; + +public interface RegResultMapper { + void insertRegPatMain(RegPatMain regPatMain); + void deleteRegPatMain(String reportNo); + void insertRegResult(RegResult regResult); + void deleteRegResult(String reportNo); + void insertRegResultGerm(RegResultGerm regResultGerm); + void deleteRegResultGerm(String reportNo); + void insertRegResultMed(RegResultMed regResultMed); + void deleteRegResultMed(String reportNo); + void insertRegReportFile(RegReportFile regReportFile); + void deleteRegReportFile(String reportNo); +} diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/LisReportDTO.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/LisReportDTO.java new file mode 100644 index 0000000..ae67f0f --- /dev/null +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/pojo/DTO/LisReportDTO.java @@ -0,0 +1,19 @@ +package com.transitPlatForm.transitPF.pojo.DTO; + +import com.transitPlatForm.common.core.domain.entity.reg.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LisReportDTO { + private RegPatMain regPatMain; + private List regResultList; + private List regResultGermList; + private List regResultMedList; + private RegReportFile regReportFile; +} diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java index c0be3e6..3752ec1 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/RegRequestInfoService.java @@ -1,6 +1,7 @@ package com.transitPlatForm.transitPF.service; import com.transitPlatForm.common.core.domain.Result; +import com.transitPlatForm.common.core.domain.entity.reg.RegApply; import com.transitPlatForm.transitPF.pojo.DTO.reqinfo.RegRequestInfoDTO; import com.transitPlatForm.transitPF.pojo.DTO.ReqApplyInfoDTO; import com.transitPlatForm.transitPF.pojo.DTO.reqinfo.printDTO; @@ -21,4 +22,6 @@ public interface RegRequestInfoService { Result cancelReq(String applyId); Result printcheck(); Result printsetup(); + + Result getPatInfo(RegRequestInfoDTO regRequestInfoDTO); } diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegHospitalServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegHospitalServiceImpl.java index aa8cf5a..155795f 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegHospitalServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegHospitalServiceImpl.java @@ -6,10 +6,12 @@ import com.transitPlatForm.common.utils.StringUtils; import com.transitPlatForm.interfaceCommon.mapper.RegHospitalMapper; import com.transitPlatForm.common.core.domain.entity.reg.RegHospital; import com.transitPlatForm.transitPF.service.RegHospitalService; +import com.transitPlatForm.transitPF.service.util.RegHospitalUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; @Service @@ -17,6 +19,8 @@ import java.util.List; public class RegHospitalServiceImpl implements RegHospitalService { @Autowired RegHospitalMapper hospitalMapper; + @Resource + RegHospitalUtil regHospitalUtil; /** * 查询医疗机构信息集合 @@ -135,12 +139,12 @@ public class RegHospitalServiceImpl implements RegHospitalService { /** * 新增保存医疗机构信息 * - * @param Hospital 医疗机构信息 + * @param hospital 医疗机构信息 * @return 结果 */ @Override - public int insertHospital(RegHospital Hospital) { - return hospitalMapper.insertHospital(Hospital); + public int insertHospital(RegHospital hospital) { + return regHospitalUtil.updateHospital(hospital); } /** diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java index 795f58f..6ea7fd9 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegInterfaceImpl.java @@ -8,6 +8,7 @@ import com.transitPlatForm.common.core.domain.entity.reg.RegApply; import com.transitPlatForm.interfaceCommon.mapper.RegApplyMapper; import com.transitPlatForm.interfaceCommon.utils.CommonUtil; import com.transitPlatForm.transitPF.mapper.RegTransitSampleMapper; +import com.transitPlatForm.transitPF.pojo.DTO.LisReportDTO; import com.transitPlatForm.transitPF.pojo.DTO.SampleSignVO; import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample; import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSampleDetail; @@ -288,6 +289,37 @@ public class RegInterfaceImpl { } + /** + *{ + * "method":"addReport", + * "req":{ + * "regPatMain":{}, + * "regResultList":[{}], + * "regResultGermList":[{}], + * "regResultMedList":[{}], + * "regReportFile":{} + * } + * } + * 添加报告 + * @param jsonStr + * @return + */ + public Result addReport(String jsonStr){ + JSONObject jsonObject = JSONUtil.parseObj(jsonStr).getJSONObject("req"); + LisReportDTO lisReportDTO = jsonObject.toBean(LisReportDTO.class); + requestInfoUtil.addLisReport(lisReportDTO); + return new Result("0","添加报告成功！"); + } + + + public Result delReport(String jsonStr){ + JSONObject jsonObject = JSONUtil.parseObj(jsonStr).getJSONObject("req"); + String reportNo = jsonObject.getStr("reportNo"); + requestInfoUtil.delLisReport(reportNo); + return new Result("0","删除成功！"); + } + + diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java index 66d57b8..88bc36e 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegRequestInfoServiceImpl.java @@ -549,6 +549,14 @@ public class RegRequestInfoServiceImpl implements RegRequestInfoService { return sendprintmsg(JSONUtil.toJsonStr(wsMessage)); } + @Override + public Result getPatInfo(RegRequestInfoDTO regRequestInfoDTO) { + String patId = regRequestInfoDTO.getPatId(); + String srcHospCode = regRequestInfoDTO.getSrcHospCode(); + RegApply regApply = regRequestInfoMapper.getPatInfo(patId, srcHospCode); + return new Result("0","查询数据成功！",regApply); + } + private String getLocalid() { SysLoginParam user = SecurityUtils.getLoginUser().getSysLoginParam(); if (user != null) { diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java index ec24ff2..1ffebc0 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/impl/RegTransitSampleServiceImpl.java @@ -63,6 +63,10 @@ public class RegTransitSampleServiceImpl implements RegTransitSampleService { return regInterfaceImpl.queryTransitSample(jsonStr); case "update": //修改状态， 目前只写了送检状态的 return regInterfaceImpl.updateStatus(jsonStr); + case "addReport": + return regInterfaceImpl.addReport(jsonStr); + case "delReport": + return regInterfaceImpl.delReport(jsonStr); // case "test": // return test(); default: diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/util/RegHospitalUtil.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/util/RegHospitalUtil.java new file mode 100644 index 0000000..80721b3 --- /dev/null +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/util/RegHospitalUtil.java @@ -0,0 +1,42 @@ +package com.transitPlatForm.transitPF.service.util; + +import com.transitPlatForm.common.core.domain.entity.SysDept; +import com.transitPlatForm.common.core.domain.entity.reg.RegHospital; +import com.transitPlatForm.interfaceCommon.mapper.RegHospitalMapper; +import com.transitPlatForm.interfaceCommon.mapper.SysDeptMapper; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; + +@Component +public class RegHospitalUtil { + + @Resource + private RegHospitalMapper hospitalMapper; + @Resource + private SysDeptMapper deptMapper; + + @Transactional(rollbackFor = Exception.class) + public int updateHospital(RegHospital hospital){ + //新增部门数据 + SysDept sysDept = new SysDept(); + sysDept.setParentId(202L); + sysDept.setDeptName(hospital.getHospitalName()); + sysDept.setOrderNum(0); + sysDept.setStatus("0"); + sysDept.setDelFlag("0"); + sysDept.setAncestors("0,100,202"); + deptMapper.insertDept(sysDept); + Long deptId = sysDept.getDeptId(); + hospital.setDept(deptId.toString()); + //保存医疗机构数据 + return hospitalMapper.insertHospital(hospital); + + } + + +// public String getDeptId(String hospitalName){ +// deptMapper.selectDeptList() +// } +} diff --git a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/util/RequestInfoUtil.java b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/util/RequestInfoUtil.java index 318a5a2..5867eda 100644 --- a/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/util/RequestInfoUtil.java +++ b/pf_transitPF/src/main/java/com/transitPlatForm/transitPF/service/util/RequestInfoUtil.java @@ -1,10 +1,10 @@ package com.transitPlatForm.transitPF.service.util; -import com.transitPlatForm.common.core.domain.entity.reg.RegApply; -import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSample; -import com.transitPlatForm.common.core.domain.entity.reg.RegTransitSampleDetail; +import com.transitPlatForm.common.core.domain.entity.reg.*; import com.transitPlatForm.interfaceCommon.mapper.RegApplyMapper; +import com.transitPlatForm.transitPF.mapper.RegResultMapper; import com.transitPlatForm.transitPF.mapper.RegTransitSampleMapper; +import com.transitPlatForm.transitPF.pojo.DTO.LisReportDTO; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; @@ -20,6 +20,8 @@ public class RequestInfoUtil { private RegApplyMapper regApplyMapper; @Resource private RegTransitSampleMapper regTransitSampleMapper; + @Resource + RegResultMapper regResultMapper; @Transactional(rollbackFor = Exception.class) @@ -59,4 +61,42 @@ public class RequestInfoUtil { } + @Transactional(rollbackFor = Exception.class) + public void addLisReport(LisReportDTO lisReportDTO){ + RegPatMain regPatMain = lisReportDTO.getRegPatMain(); + String reportNo = regPatMain.getReportNo(); + List regResultList = lisReportDTO.getRegResultList(); + List regResultGermList = lisReportDTO.getRegResultGermList(); + List regResultMedList = lisReportDTO.getRegResultMedList(); + RegReportFile regReportFile = lisReportDTO.getRegReportFile(); + regResultMapper.deleteRegPatMain(reportNo); + regResultMapper.deleteRegResult(reportNo); + regResultMapper.deleteRegResultMed(reportNo); + regResultMapper.deleteRegResultGerm(reportNo); + regResultMapper.deleteRegReportFile(reportNo); + + regResultMapper.insertRegPatMain(regPatMain); + for (RegResult regResult : regResultList) { + regResultMapper.insertRegResult(regResult); + } + for (RegResultGerm regResultGerm : regResultGermList) { + regResultMapper.insertRegResultGerm(regResultGerm); + } + for (RegResultMed regResultMed : regResultMedList) { + regResultMapper.insertRegResultMed(regResultMed); + } + + regResultMapper.insertRegReportFile(regReportFile); + } + + @Transactional(rollbackFor = Exception.class) + public void delLisReport(String reportNo){ + regResultMapper.deleteRegPatMain(reportNo); + regResultMapper.deleteRegResult(reportNo); + regResultMapper.deleteRegResultMed(reportNo); + regResultMapper.deleteRegResultGerm(reportNo); + regResultMapper.deleteRegReportFile(reportNo); + } + + } diff --git a/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml b/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml index 84e0fff..ff95579 100644 --- a/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml +++ b/pf_transitPF/src/main/resources/mapper/RegRequestInfoMapper.xml @@ -29,4 +29,9 @@ select * from reg_TransitSample_detail where applyid = #{applyId} and applyDetailId = #{applyDetailId} + + + \ No newline at end of file diff --git a/pf_transitPF/src/main/resources/mapper/RegResultMapper.xml b/pf_transitPF/src/main/resources/mapper/RegResultMapper.xml new file mode 100644 index 0000000..711cb05 --- /dev/null +++ b/pf_transitPF/src/main/resources/mapper/RegResultMapper.xml @@ -0,0 +1,219 @@ + + + + + insert into reg_pat_main(reportno, hospcode, hospname, patid, patcardtype, patcardno, pattype, regno, patname, + patsex, patage, ageunit, patbirthday, patidentity, phone, address, patfeetype, + departcode, departname, areacode, areaname, patbed, diagnosiscode, diagnosisname, + orderpatid, orderusercode, orderusername, ordertime, srchospcode, srchospname, barcode, + tubecode, tubename, sampletypecode, sampletypename, iser, orderitemcodes, + orderitemnames, collectdate, signindate, testdate, reporttime, reportusercode, + reportusername, sampletrait, reportkindcode, reportkindname, reportdescrpt, + lisgroupcode, lisgroupname, dsthospcode, dsthospname) + values( #{reportno}, + #{hospcode}, + #{hospname}, + #{patid}, + #{patcardtype}, + #{patcardno}, + #{pattype}, + #{regno}, + #{patname}, + #{patsex}, + #{patage}, + #{ageunit}, + #{patbirthday}, + #{patidentity}, + #{phone}, + #{address}, + #{patfeetype}, + #{departcode}, + #{departname}, + #{areacode}, + #{areaname}, + #{patbed}, + #{diagnosiscode}, + #{diagnosisname}, + #{orderpatid}, + #{orderusercode}, + #{orderusername}, + #{ordertime}, + #{srchospcode}, + #{srchospname}, + #{barcode}, + #{tubecode}, + #{tubename}, + #{sampletypecode}, + #{sampletypename}, + #{iser}, + #{orderitemcodes}, + #{orderitemnames}, + #{collectdate}, + #{signindate}, + #{testdate}, + #{reporttime}, + #{reportusercode}, + #{reportusername}, + #{sampletrait}, + #{reportkindcode}, + #{reportkindname}, + #{reportdescrpt}, + #{lisgroupcode}, + #{lisgroupname}, + #{dsthospcode}, + #{dsthospname} + + ) + + + + delete from reg_pat_main where reportno=#{reportno} + + + + insert into reg_result(reportno, patid, hospcode, hospname, itemresultno, testtime, testusercode, testusername, + audittime, auditusercode, auditusername, itemcode, itemname, itemnamecn, itemcodesb, + itemnamesb, lonic, itemmethodcode, itemmethodname, equipmentcode, testinstcode, + testinstcodesb, testinstname, itemresult, itemresulttext, resultremark, itemunit, + itemref, itemrefmin, itemrefmax, itemflag, itemflagstr, checkflag, crtflag, crtref, + orderitemcode, orderitemname, printsort) + values (#{reportno}, + #{patid}, + #{hospcode}, + #{hospname}, + #{itemresultno}, + #{testtime}, + #{testusercode}, + #{testusername}, + #{audittime}, + #{auditusercode}, + #{auditusername}, + #{itemcode}, + #{itemname}, + #{itemnamecn}, + #{itemcodesb}, + #{itemnamesb}, + #{lonic}, + #{itemmethodcode}, + #{itemmethodname}, + #{equipmentcode}, + #{testinstcode}, + #{testinstcodesb}, + #{testinstname}, + #{itemresult}, + #{itemresulttext}, + #{resultremark}, + #{itemunit}, + #{itemref}, + #{itemrefmin}, + #{itemrefmax}, + #{itemflag}, + #{itemflagstr}, + #{checkflag}, + #{crtflag}, + #{crtref}, + #{orderitemcode}, + #{orderitemname}, + #{printsort} + ) + + + + delete from reg_result where reportno = #{reportno} + + + + insert into reg_result_germ(reportno, patid, hospcode, hospname, germresultno, germcode, germname, germnamecn, germcodesb, germnamesb, colonycounting, colonyratio, mediumname, culturetime, cultureneed, discoverymode, equipmentcode, testinstcode, testinstcodesb, testinstname, testresult, itemresulttext, ismultidrugr, multidrugrname, crtflag, isinfectious, isbiohazard, printsort) + values ( + #{reportno}, + #{patid}, + #{hospcode}, + #{hospname}, + #{germresultno}, + #{germcode}, + #{germname}, + #{germnamecn}, + #{germcodesb}, + #{germnamesb}, + #{colonycounting}, + #{colonyratio}, + #{mediumname}, + #{culturetime}, + #{cultureneed}, + #{discoverymode}, + #{equipmentcode}, + #{testinstcode}, + #{testinstcodesb}, + #{testinstname}, + #{testresult}, + #{itemresulttext}, + #{ismultidrugr}, + #{multidrugrname}, + #{crtflag}, + #{isinfectious}, + #{isbiohazard}, + #{printsort} + + ) + + + + delete from reg_result_germ where reportno = #{reportno} + + + + insert into reg_result_med(reportno, patid, hospcode, hospname, sensresultno, germresultno, anticode, antiname, + antinamecn, anticodesb, antinamesb, testmethodcode, testmethodname, testresult, + resistantcode, resistantname, itemref, dosage, mic, diameterofinhibitionring, + sensremark, printsort) + values (#{reportno}, + #{patid}, + #{hospcode}, + #{hospname}, + #{sensresultno}, + #{germresultno}, + #{anticode}, + #{antiname}, + #{antinamecn}, + #{anticodesb}, + #{antinamesb}, + #{testmethodcode}, + #{testmethodname}, + #{testresult}, + #{resistantcode}, + #{resistantname}, + #{itemref}, + #{dosage}, + #{mic}, + #{diameterofinhibitionring}, + #{sensremark}, + #{printsort} + ) + + + + delete from reg_result_med where reportno = #{reportno} + + + + insert into reg_report_file(reportno, reportfilename, reportformat, report, hospcode, hospname, operatetime, usercode, username) + values( + #{reportno}, + #{reportfilename}, + #{reportformat}, + #{report}, + #{hospcode}, + #{hospname}, + #{operatetime}, + #{usercode}, + #{username} + ) + + + + delete from reg_report_file where reportno = #{reportno} + + + \ No newline at end of file