ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
@@ -57,9 +57,9 @@ } /** * 新增任务 * 新增体检任务进子任务 */ @ApiOperation("新增任务") @ApiOperation("新增体检任务进子任务") @PostMapping("/generalInterfaceAddTask") public AjaxResult generalInterfaceAddTask(@RequestBody ServiceTaskInfo serviceTaskInfo) { log.error("------serviceTaskInfo的值为：{}", serviceTaskInfo); ruoyi-admin/src/main/resources/application.yml
@@ -18,7 +18,7 @@ # 开发环境配置 server: # 服务器的HTTP端口，默认为8080 port: 8096 port: 8095 servlet: # 应用的访问路径 context-path: / ruoyi-admin/src/main/resources/logback.xml
@@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <configuration> <!-- 日志存放路径 8095--> <!-- <property name="log.path" value="D:/health/logs"/>--> <property name="log.path" value="D:/health/logs"/> <!-- 日志存放路径 8096--> <property name="log.path" value="D:/lihu/logs"/> <!-- <property name="log.path" value="D:/lihu/logs"/>--> <!-- 丽水日志存放路径 --> <!-- <property name="log.path" value="/home/software/smartor-logs" />--> <!-- 日志输出格式 --> ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUserDept.java
@@ -37,6 +37,7 @@ @ApiModelProperty("部门类型") @Excel(name = "部门类型 1:科室 2:病区") private String deptType; private String guid; /** ruoyi-common/src/main/java/com/ruoyi/common/enums/ServiceTaskTypeEnum.java
@@ -4,7 +4,7 @@ * 发送类型枚举 */ public enum ServiceTaskTypeEnum { 体检随访("9", "体检随访 "), 医技随访("10", "医技随访"); 体检随访("9", "体检随访"), 医技随访("10", "医技随访"); private String code; ruoyi-common/src/main/java/com/ruoyi/common/enums/TaskTypeEnum.java
@@ -4,7 +4,7 @@ * 发送类型枚举 */ public enum TaskTypeEnum { 体检随访("8", "体检随访"), 心电专科随访("9", "、心电专科随访"), 影像专科随访("10", "影像专科随访"); 体检随访("8", "体检随访"), 心电专科随访("9", "心电专科随访"), 影像专科随访("10", "影像专科随访"); private String code; ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -468,6 +468,7 @@ sysUserDept.setUserId(user.getUserId()); sysUserDept.setOrgid(user.getOrgid()); sysUserDept.setDeptCode(deptCode); sysUserDept.setDeptId(sysDept.getDeptId()); List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sysUserDept); sysUserDept.setDelFlag(0L); sysUserDept.setDeptType("1"); @@ -489,6 +490,7 @@ SysUserDept sysUserDept = new SysUserDept(); sysUserDept.setUserId(user.getUserId()); sysUserDept.setDeptCode(wardCode); sysUserDept.setDeptId(sysDept.getDeptId()); List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sysUserDept); sysUserDept.setDelFlag(0L); sysUserDept.setDeptType("2"); smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -526,6 +526,7 @@ Map yeWuXX = (Map) dataMap.get("YeWuXX"); Map XiaoXiTou = (Map) dataMap.get("XiaoXiTou"); String FaSongJGID = ObjectUtils.isNotEmpty(XiaoXiTou.get("FaSongJGID")) ? XiaoXiTou.get("FaSongJGID").toString() : null; String FaSongJGMC = ObjectUtils.isNotEmpty(XiaoXiTou.get("FaSongJGMC")) ? XiaoXiTou.get("FaSongJGMC").toString() : null; Map<String, Object> BingRenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("BingRenXX") : null; Map<String, Object> JiuZhenXX = ObjectUtils.isNotEmpty(yeWuXX) ? (Map<String, Object>) yeWuXX.get("JiuZhenXX") : null; @@ -546,6 +547,7 @@ info.setZhenDuanMC((String) map.get("ZhenDuanMC")); info.setZhenDuanLBDM((String) map.get("ZhenDuanLBDM")); info.setZhenDuanLBMC((String) map.get("ZhenDuanLBMC")); info.setIcd10((String) map.get("Icd10")); return info; }).collect(Collectors.toList()); } @@ -560,7 +562,7 @@ PatMedOuthosp patMedOuthosp = new PatMedOuthosp(); patMedOuthosp.setOuthospno(externalInHospPatientInfo.getBingAnHao()); patMedOuthosp.setSerialnum(ObjectUtils.isNotEmpty(yeWuXX.get("JiuZhenYWID")) ? yeWuXX.get("JiuZhenYWID").toString() : null); patMedOuthosp.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID()); List<PatMedOuthosp> patMedOuthosps = patMedOuthospMapper.selectPatMedOuthospList(patMedOuthosp); patMedOuthosp.setPatid(patArchive.getId()); @@ -572,6 +574,7 @@ patMedOuthosp.setDeptcode(externalJZInfo.getJiuZhenKSID()); patMedOuthosp.setAdmitdate(externalJZInfo.getJiuZhenRQ()); patMedOuthosp.setOrgid(FaSongJGID); patMedOuthosp.setHospitalname(FaSongJGMC); for (ExternalDiagnosisInfo externalDiagnosisInfo : externalDiagnosisInfoList) { if (externalDiagnosisInfo.getZhenDuanLBMC().equals("主诊断")) { @@ -751,7 +754,7 @@ patMedOperation.setPatno(externalInHospPatientInfo.getBingRenID()); patMedOperation.setPatname(externalInHospPatientInfo.getXingMing()); patMedOperation.setOrgid(externalInHospPatientInfo.getZuZhiJGID()); patMedOperation.setSerialnum(externalInHospPatientInfo.getZhuYuanHao()); patMedOperation.setSerialnum(externalInHospPatientInfo.getJiuZhenYWID()); patMedOperation.setInhospno(externalInHospPatientInfo.getBingAnHao()); patMedOperation.setHospitalname(externalInHospPatientInfo.getZuZhiJGMC()); patMedOperation.setHospitalcode(externalInHospPatientInfo.getZuZhiJGID()); smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -375,13 +375,20 @@ if (serviceTask.getSendState() == null) { serviceTask.setSendState(1L); serviceTaskVO.setSendState(1L); }else { serviceTask.setSendState(serviceTaskVO.getSendState()); } if (StringUtils.isNotEmpty(serviceTaskVO.getLibtemplateid())) { serviceTask.setLibtemplateid(serviceTaskVO.getLibtemplateid()); serviceTask.setLibtemplatename(serviceTaskVO.getLibtemplatename()); } serviceTask.setTemplateid(tempid); serviceTask.setTemplatename(tempName); if (serviceTaskVO.getTemplateid() != null) { serviceTask.setTemplateid(serviceTaskVO.getTemplateid()); serviceTask.setTemplatename(serviceTaskVO.getTemplatename()); } else { serviceTask.setTemplateid(tempid); serviceTask.setTemplatename(tempName); } serviceTask.setLeaveldeptcodes(serviceTaskVO.getLeaveldeptcodes()); serviceTask.setLeavehospitaldistrictcode(serviceTask.getLeavehospitaldistrictcode()); serviceTask.setSendState(2L); smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -545,7 +545,7 @@ FROM pat_med_inhosp d JOIN pat_archive a ON a.id = d.patid LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid = LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid = d.patid <where> d.del_flag != 1 @@ -669,7 +669,7 @@ t.tagname, a.pattype from pat_med_outhosp d JOIN pat_archive a ON a.id = d.patid LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid = LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid = d.patid <where> d.del_flag != 1 @@ -756,7 +756,7 @@ t.tagname, a.pattype from pat_med_physical d JOIN pat_archive a ON a.id = d.patid LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid = LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid = d.patid <where> d.del_flag != 1 @@ -855,7 +855,7 @@ FROM pat_med_inhosp d JOIN pat_archive a ON a.id = d.patid LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid = LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid = d.patid <where> d.del_flag != 1 @@ -961,7 +961,7 @@ t.tagname, a.pattype from pat_med_outhosp d JOIN pat_archive a ON a.id = d.patid LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid = LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid = d.patid <where> d.del_flag != 1 @@ -1048,7 +1048,7 @@ t.tagname, a.pattype from pat_med_physical d JOIN pat_archive a ON a.id = d.patid LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag GROUP BY patid ) t ON t.patid = LEFT JOIN ( SELECT patid, GROUP_CONCAT( tagname ) AS tagname FROM pat_archivetag where del_flag=0 GROUP BY patid ) t ON t.patid = d.patid <where> d.del_flag != 1
