.idea/workspace.xml
@@ -5,23 +5,15 @@ </component> <component name="ChangeListManager"> <list default="true" id="d7325e97-ef1a-4946-a53e-fea72f2992f8" name="Changes" comment=""> <change afterPath="$PROJECT_DIR$/ruoyi-common/src/main/java/com/ruoyi/common/enums/HospTypeEnum.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/ruoyi-common/src/main/java/com/ruoyi/common/enums/ServiceTaskTypeEnum.java" afterDir="false" /> <change afterPath="$PROJECT_DIR$/ruoyi-common/src/main/java/com/ruoyi/common/enums/TaskTypeEnum.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/test/MQTest.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application-druid.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application-druid.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application.yml" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-admin/src/main/resources/application.yml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-framework/src/main/java/com/ruoyi/framework/interceptor/HospitalFilterInterceptor.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/ServiceSubtaskVO.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/ServiceTaskInfo.java" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/domain/ServiceTaskInfo.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/mapper/ServiceSubtaskMapper.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceExternalServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/resources/mapper/smartor/PatArchiveMapper.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml" beforeDir="false" afterPath="$PROJECT_DIR$/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml" afterDir="false" /> </list> <option name="SHOW_DIALOG" value="false" /> @@ -79,7 +71,7 @@ <property name="ToolWindow问题.ShowToolbar" value="false" /> <property name="WebServerToolWindowFactoryState" value="false" /> <property name="aspect.path.notification.shown" value="true" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../smartor-wuxi" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../smartor-old" /> <property name="node.js.detected.package.eslint" value="true" /> <property name="node.js.detected.package.tslint" value="true" /> <property name="node.js.path.for.package.eslint" value="project" /> @@ -344,7 +336,11 @@ <workItem from="1739411538383" duration="21710000" /> <workItem from="1739501318573" duration="2373000" /> <workItem from="1739507523684" duration="15221000" /> <workItem from="1739766088739" duration="19190000" /> <workItem from="1739766088739" duration="19833000" /> <workItem from="1739853347397" duration="14985000" /> <workItem from="1739883449850" duration="1411000" /> <workItem from="1739925717690" duration="1204000" /> <workItem from="1739929607529" duration="1684000" /> </task> <task id="LOCAL-00001" summary="代码提交"> <created>1730948127775</created> @@ -402,7 +398,14 @@ <option name="project" value="LOCAL" /> <updated>1739766619501</updated> </task> <option name="localTasksCounter" value="9" /> <task id="LOCAL-00009" summary="往队列新增是，判断是往头部新增还是往尾部新增"> <created>1739789537550</created> <option name="number" value="00009" /> <option name="presentableId" value="LOCAL-00009" /> <option name="project" value="LOCAL" /> <updated>1739789537550</updated> </task> <option name="localTasksCounter" value="10" /> <servers /> </component> <component name="TypeScriptGeneratedFilesManager"> @@ -554,11 +557,6 @@ <option name="timeStamp" value="351" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java</url> <line>266</line> <option name="timeStamp" value="352" /> </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java</url> <line>46</line> <option name="timeStamp" value="354" /> @@ -585,7 +583,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java</url> <line>148</line> <line>149</line> <option name="timeStamp" value="359" /> </line-breakpoint> <line-breakpoint type="java-line"> @@ -710,7 +708,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java</url> <line>205</line> <line>206</line> <option name="timeStamp" value="415" /> </line-breakpoint> <line-breakpoint type="java-line"> @@ -745,7 +743,7 @@ </line-breakpoint> <line-breakpoint type="java-line"> <url>file://$PROJECT_DIR$/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceSubtaskController.java</url> <line>204</line> <line>205</line> <option name="timeStamp" value="427" /> </line-breakpoint> <line-breakpoint type="java-line"> @@ -763,6 +761,21 @@ <line>107</line> <option name="timeStamp" value="431" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java</url> <line>265</line> <option name="timeStamp" value="432" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java</url> <line>263</line> <option name="timeStamp" value="433" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-line"> <url>file://$PROJECT_DIR$/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java</url> <line>366</line> <option name="timeStamp" value="434" /> </line-breakpoint> <line-breakpoint enabled="true" type="java-method"> <url>file://$PROJECT_DIR$/smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskAnswerServiceImpl.java</url> <line>338</line> 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
@@ -310,7 +310,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="diagname != null and diagname != ''">diagname,</if> <if test="libtemplateid != null ">libtemplateid,</if> @@ -383,7 +383,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="diagname != null and diagname != ''">#{diagname},</if> <if test="libtemplateid != null ">#{libtemplateid},</if> @@ -460,7 +460,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="diagname != null and diagname != ''">diagname = #{diagname},</if> <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if> @@ -538,7 +538,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="diagname != null and diagname != ''">diagname = #{diagname},</if> <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if> @@ -617,7 +617,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="diagname != null and diagname != ''">diagname = #{diagname},</if> <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if> @@ -695,7 +695,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="diagname != null and diagname != ''">diagname = #{diagname},</if> <if test="libtemplateid != null ">libtemplateid = #{libtemplateid},</if>
