ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java
@@ -18,6 +18,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -160,7 +161,7 @@ @PostMapping("/addSubTask") public AjaxResult addSubTask(@RequestBody ServiceSubtask serviceSubtask) { SysUser user = getLoginUser().getUser(); serviceSubtask.setOrgid(user.getOrgid()); if (ObjectUtils.isNotEmpty(user)) serviceSubtask.setOrgid(user.getOrgid()); return toAjax(serviceSubtaskService.insertServiceSubtask(serviceSubtask)); }
@@ -369,6 +369,7 @@ SysUserDept sysUserDept = new SysUserDept(); sysUserDept.setUserId(user.getUserId()); sysUserDept.setOrgid(user.getOrgid()); sysUserDept.setDeptCode(deptCode); List<SysUserDept> sysUserDepts = sysUserDeptMapper.selectSysUserDeptList(sysUserDept); sysUserDept.setDelFlag(0L); @@ -376,6 +377,7 @@ sysUserDept.setDeptName(sysDept.getDeptName()); sysUserDept.setUpdateTime(new Date()); if (!CollectionUtils.isEmpty(sysUserDepts)) { sysUserDept.setId(sysUserDepts.get(0).getId()); sysUserDeptMapper.updateSysUserDept(sysUserDept); continue; } smartor/src/main/java/com/smartor/domain/ServiceTaskInfo.java
@@ -126,6 +126,10 @@ @ApiModelProperty(value = "beizhu") private String remark; /** * 删除标记 */ @ApiModelProperty(value = "删除标记") private String delflag = "0"; } smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java
@@ -434,7 +434,9 @@ patMedInhosp.setHospitalcode(externalInHospPatientInfo.getZuZhiJGID()); patMedInhosp.setStarttime(externalInHospPatientInfo.getRuYuanSJ()); patMedInhosp.setDeptcode(externalInHospPatientInfo.getDangQianKSID()); patMedInhosp.setLeaveldeptcode(externalInHospPatientInfo.getDangQianKSID()); patMedInhosp.setDeptname(externalInHospPatientInfo.getDangQianKSMC()); patMedInhosp.setLeaveldeptname(externalInHospPatientInfo.getDangQianKSMC()); patMedInhosp.setBedNo(externalInHospPatientInfo.getDangQianCWID()); patMedInhosp.setOrgid(externalInHospPatientInfo.getZuZhiJGID()); patMedInhosp.setHospitaldistrictid(externalInHospPatientInfo.getDangQianBQID()); @@ -443,7 +445,9 @@ patMedInhosp.setOperator(externalInHospPatientInfo.getCaoZuoRXM()); patMedInhosp.setOperatorId(externalInHospPatientInfo.getCaoZuoRID()); patMedInhosp.setHospitaldistrictcode(externalInHospPatientInfo.getDangQianBQID()); patMedInhosp.setLeavehospitaldistrictcode(externalInHospPatientInfo.getDangQianBQID()); patMedInhosp.setHospitaldistrictname(externalInHospPatientInfo.getDangQianBQMC()); patMedInhosp.setLeavehospitaldistrictname(externalInHospPatientInfo.getDangQianBQMC()); } if (ObjectUtils.isNotEmpty(externalInHospPatientDiagnoseInfo)) { patMedInhosp.setIcd10code(StringUtils.isNotEmpty(patMedInhosp.getIcd10code()) ? patMedInhosp.getIcd10code() + "," + externalInHospPatientDiagnoseInfo.getZhenDuanID() : externalInHospPatientDiagnoseInfo.getZhenDuanID()); smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
@@ -234,6 +234,7 @@ serviceSubtask.setEndtime(serviceTaskVO.getFinishtime()); serviceSubtask.setResult(serviceTaskVO.getResult()); serviceSubtask.setSuggest(serviceTaskVO.getSuggest()); serviceSubtask.setDelFlag(serviceTaskVO.getDelflag()); serviceSubtask.setOrgid(serviceTaskVO.getOrgguid()); serviceSubtask.setPatid(serviceTaskVO.getPatguid()); serviceSubtask.setSendname(serviceTaskVO.getPatname()); @@ -259,7 +260,7 @@ serviceSubtask.setCreateTime(new Date()); //先查询一遍，该taskGuid是否存在 ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO(); serviceSubtaskVO.setTaskGuid(serviceTaskVO.getGuid()); serviceSubtaskVO.setTaskGuid(serviceTaskVO.getTaskguid()); List<ServiceSubtask> serviceSubtaskList = serviceSubtaskMapper.selectServiceSubtaskList(serviceSubtaskVO); if (CollectionUtils.isNotEmpty(serviceSubtaskList)) { serviceSubtaskMapper.updateServiceSubtaskByTaskGuid(serviceSubtask); smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml
@@ -630,8 +630,6 @@ a.create_time, a.isupload, a.upload_time, d.leavehospitaldistrictcode AS leavehospitaldistrictcode, d.leavehospitaldistrictname AS leavehospitaldistrictname, 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 = @@ -659,9 +657,6 @@ </if> <if test="deptname != null and deptname != ''"> and d.deptname LIKE concat('%', #{deptname}, '%') </if> <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''"> and d.leavehospitaldistrictname LIKE concat('%', #{leavehospitaldistrictname}, '%') </if> <if test="drname != null and drname != ''"> AND d.drname LIKE concat('%',#{drname}, '%') @@ -923,8 +918,6 @@ a.create_time, a.isupload, a.upload_time, d.leavehospitaldistrictcode AS leavehospitaldistrictcode, d.leavehospitaldistrictname AS leavehospitaldistrictname, 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 = @@ -952,9 +945,6 @@ </if> <if test="deptname != null and deptname != ''"> and d.deptname LIKE concat('%', #{deptname}, '%') </if> <if test="leavehospitaldistrictname != null and leavehospitaldistrictname != ''"> and d.leavehospitaldistrictname LIKE concat('%', #{leavehospitaldistrictname}, '%') </if> <if test="drname != null and drname != ''"> AND d.drname LIKE concat('%',#{drname}, '%') smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -311,7 +311,7 @@ <if test="hospno != null and hospno != ''">hospno,</if> <if test="wechat != null and wechat != ''">wechat,</if> <if test="roomno != null and roomno != ''">roomno,</if> <if test="admindate != null and admindate != ''">admindate,</if> <if test="admindate != null">admindate,</if> <if test="deptname != null and deptname != ''">deptname,</if> <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code,</if> <if test="leavediagname != null and leavediagname != ''">leavediagname,</if> @@ -385,7 +385,7 @@ <if test="hospno != null and hospno != ''">#{hospno},</if> <if test="wechat != null and wechat != ''">#{wechat},</if> <if test="roomno != null and roomno != ''">#{roomno},</if> <if test="admindate != null and admindate != ''">#{admindate},</if> <if test="admindate != null ">#{admindate},</if> <if test="deptname != null and deptname != ''">#{deptname},</if> <if test="leaveicd10code != null and leaveicd10code != ''">#{leaveicd10code},</if> <if test="leavediagname != null and leavediagname != ''">#{leavediagname},</if> @@ -463,7 +463,7 @@ <if test="hospno != null and hospno != ''">hospno = #{hospno},</if> <if test="wechat != null and wechat != ''">wechat = #{wechat},</if> <if test="roomno != null and roomno != ''">roomno = #{roomno},</if> <if test="admindate != null and admindate != ''">admindate = #{admindate},</if> <if test="admindate != null ">admindate = #{admindate},</if> <if test="deptname != null and deptname != ''">deptname = #{deptname},</if> <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if> <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if> @@ -542,7 +542,7 @@ <if test="hospno != null and hospno != ''">hospno = #{hospno},</if> <if test="wechat != null and wechat != ''">wechat = #{wechat},</if> <if test="roomno != null and roomno != ''">roomno = #{roomno},</if> <if test="admindate != null and admindate != ''">admindate = #{admindate},</if> <if test="admindate != null">admindate = #{admindate},</if> <if test="deptname != null and deptname != ''">deptname = #{deptname},</if> <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if> <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if> @@ -622,7 +622,7 @@ <if test="hospno != null and hospno != ''">hospno = #{hospno},</if> <if test="wechat != null and wechat != ''">wechat = #{wechat},</if> <if test="roomno != null and roomno != ''">roomno = #{roomno},</if> <if test="admindate != null and admindate != ''">admindate = #{admindate},</if> <if test="admindate != null">admindate = #{admindate},</if> <if test="deptname != null and deptname != ''">deptname = #{deptname},</if> <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if> <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if> @@ -701,7 +701,7 @@ <if test="hospno != null and hospno != ''">hospno = #{hospno},</if> <if test="wechat != null and wechat != ''">wechat = #{wechat},</if> <if test="roomno != null and roomno != ''">roomno = #{roomno},</if> <if test="admindate != null and admindate != ''">admindate = #{admindate},</if> <if test="admindate != null ">admindate = #{admindate},</if> <if test="deptname != null and deptname != ''">deptname = #{deptname},</if> <if test="leaveicd10code != null and leaveicd10code != ''">leaveicd10code = #{leaveicd10code},</if> <if test="leavediagname != null and leavediagname != ''">leavediagname = #{leavediagname},</if>
