ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskController.java
@@ -84,7 +84,6 @@ if (CollectionUtils.isNotEmpty(serviceTaskVOS)) { for (ServiceTaskVO ServiceTaskVO : serviceTaskVOS) { if (serviceTask.getAppltype().equals("1") || serviceTask.getAppltype().equals("2")) { ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO(); serviceSubtaskVO.setTaskid(ServiceTaskVO.getTaskid()); serviceSubtaskVO.setStartOutHospTime(serviceTask.getStartOutHospTime()); @@ -98,19 +97,7 @@ ServiceTaskVO.setYfs(yfs); ServiceTaskVO.setWfs(wfs); } } else if (serviceTask.getAppltype().equals("3") || serviceTask.getAppltype().equals("4")) { ServiceSubtaskVO serviceSubtaskVO = new ServiceSubtaskVO(); serviceSubtaskVO.setTaskid(ServiceTaskVO.getTaskid()); List<ServiceSubtask> ServiceTaskcalls = iServiceTaskCallService.selectServiceSubtaskList(serviceSubtaskVO); if (CollectionUtils.isNotEmpty(ServiceTaskcalls)) { //已发送 long yfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 3L).collect(Collectors.toList()).stream().count(); //未发送 long wfs = ServiceTaskcalls.stream().filter(serviceTaskcall1 -> serviceTaskcall1.getSendstate() != null && serviceTaskcall1.getSendstate() == 2L).collect(Collectors.toList()).stream().count(); ServiceTaskVO.setYfs(yfs); ServiceTaskVO.setWfs(wfs); } } } //获取total long total = PageUtils.count(new ISelect() { @@ -118,7 +105,7 @@ public void doSelect() { serviceTask.setPageNum(null); serviceTask.setPageSize(null); serviceTaskService.selectServiceTaskList(serviceTask); serviceTaskService.selectServiceTaskAndtaskDeptList(serviceTask); } });
@@ -42,8 +42,8 @@ */ @ApiOperation("查询模板科室关联列表") //@PreAuthorize("@ss.hasPermi('smartor:taskdiag:list')") @GetMapping("/list") public TableDataInfo list(ServiceTaskdiag serviceTaskdiag) @PostMapping("/list") public TableDataInfo list(@RequestBody ServiceTaskdiag serviceTaskdiag) { startPage(); List<ServiceTaskdiag> list = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag); @@ -105,9 +105,9 @@ @ApiOperation("删除模板科室关联") //@PreAuthorize("@ss.hasPermi('smartor:taskdiag:remove')") @Log(title = "模板科室关联", businessType = BusinessType.DELETE) @GetMapping("/remove/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @GetMapping("/remove/{id}") public AjaxResult remove(@PathVariable Long id) { return toAjax(serviceTaskdiagService.deleteServiceTaskdiagByIds(ids)); return toAjax(serviceTaskdiagService.deleteServiceTaskdiagById(id)); } } ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceTaskoperController.java
@@ -42,8 +42,8 @@ */ @ApiOperation("查询模板科室关联列表") //@PreAuthorize("@ss.hasPermi('smartor:taskoper:list')") @GetMapping("/list") public TableDataInfo list(ServiceTaskoper serviceTaskoper) @PostMapping("/list") public TableDataInfo list(@RequestBody ServiceTaskoper serviceTaskoper) { startPage(); List<ServiceTaskoper> list = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper); @@ -105,9 +105,9 @@ @ApiOperation("删除模板科室关联") //@PreAuthorize("@ss.hasPermi('smartor:taskoper:remove')") @Log(title = "模板科室关联", businessType = BusinessType.DELETE) @GetMapping("/remove/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @GetMapping("/remove/{id}") public AjaxResult remove(@PathVariable Long id) { return toAjax(serviceTaskoperService.deleteServiceTaskoperByIds(ids)); return toAjax(serviceTaskoperService.deleteServiceTaskoperById(id)); } } ruoyi-admin/src/main/resources/application-druid.yml
ruoyi-generator/ruoyi-generator.iml
@@ -98,6 +98,7 @@ <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jcl-over-slf4j:1.7.36" level="project" /> <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.9" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.11.0" level="project" /> <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.4" level="project" /> <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:4.1.2" level="project" /> @@ -154,7 +155,6 @@ <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.20" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.4.15" level="project" /> <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" /> <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.15" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpmime:4.5.13" level="project" /> <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.5.13" level="project" /> <orderEntry type="library" name="Maven: com.alibaba:fastjson:1.2.41" level="project" /> ruoyi-generator/src/main/resources/vm/java/controller.java.vm
@@ -45,9 +45,9 @@ */ @ApiOperation("查询${functionName}列表") //@PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')") @GetMapping("/list") @PostMapping("/list") #if($table.crud || $table.sub) public TableDataInfo list(${ClassName} ${className}) public TableDataInfo list(@RequestBody ${ClassName} ${className}) { startPage(); List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); ruoyi-generator/src/main/resources/vm/xml/mapper.xml.vm
@@ -32,6 +32,7 @@ resultMap="${ClassName}Result"> <include refid="select${ClassName}Vo"/> <where> del_flag=0 #foreach($column in $columns) #set($queryType=$column.queryType) #set($javaField=$column.javaField) ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -71,6 +71,9 @@ private IPatMedInhospService iPatMedInhospService; @Autowired private IPatMedOperationService iPatMedOperationService; @Autowired private IServiceSubtaskService iServiceSubtaskService; @Autowired @@ -243,7 +246,7 @@ * 处理手术信息，进入子任务表 */ public void dealOperationInfo() { iPatMedInhospService.dealOutHospInfo(); iPatMedOperationService.dealOperationInfo(); } /** smartor/src/main/java/com/smartor/domain/ExternalInHospPatientInfo.java
@@ -114,6 +114,9 @@ @ApiModelProperty(value = "联系电话") private String LianXiDH; @ApiModelProperty(value = "联系人电话") private String LianXiRDH; @ApiModelProperty(value = "单位电话") private String DanWeiDH;
@@ -537,6 +537,7 @@ patArchive.setAge(externalInHospPatientInfo.getNianLing()); patArchive.setAgeUnit(externalInHospPatientInfo.getNianLingDW()); patArchive.setTelcode(externalInHospPatientInfo.getLianXiDH()); patArchive.setRelativetelcode(externalInHospPatientInfo.getLianXiRDH()); patArchive.setGuid(externalInHospPatientInfo.getZuZhiJGID()); patArchive.setOrgid(externalInHospPatientInfo.getZuZhiJGID()); if (ObjectUtils.isNotEmpty(externalInHospPatientLiaisonInfo)) smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -399,7 +399,13 @@ serviceTaskdiag.setOrgid(serviceTask.getOrgid()); serviceTaskdiag.setCreateTime(new Date()); log.error("----serviceTaskdiag的值为：{}", serviceTaskdiag); if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) { String[] Icd10codes = serviceTaskVO.getIcd10code().split(","); for (String icd10code : Icd10codes) { serviceTaskdiag.setIcd10code(icd10code); serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag); } } } else if (serviceTaskVO.getAppltype().equals("4")) { ServiceTaskoper serviceTaskoper = new ServiceTaskoper(); serviceTaskoper.setOpcode(serviceTaskVO.getOpcode()); @@ -407,12 +413,19 @@ serviceTaskoper.setTaskId(serviceTask.getTaskid()); serviceTaskoper.setTaskName(serviceTask.getTaskName()); serviceTaskoper.setLongtask(0L); if (serviceTaskVO.getLongTask() == 1) serviceTaskoper.setLongtask(1L); serviceTaskoper.setGuid(serviceTask.getGuid()); serviceTaskoper.setOrgid(serviceTask.getOrgid()); serviceTaskoper.setCreateTime(new Date()); if (serviceTaskVO.getLongTask() == 1) serviceTaskoper.setLongtask(1L); if (StringUtils.isNotEmpty(serviceTaskVO.getOpcode())) { String[] opcodes = serviceTaskVO.getOpcode().split(","); for (String opcode : opcodes) { serviceTaskoper.setOpcode(opcode); log.error("----serviceTaskoper的值为：{}", serviceTaskoper); serviceTaskoperService.insertServiceTaskoper(serviceTaskoper); } } } else { ServiceTaskdept serviceTaskdept = new ServiceTaskdept(); serviceTaskdept.setTaskId(serviceTask.getTaskid()); @@ -546,13 +559,22 @@ if (StringUtils.isEmpty(serviceTaskVO.getIcd10code())) { throw new BaseException("疾病编码为空"); } serviceTaskdiag.setIcd10code(serviceTaskVO.getIcd10code()); List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag); // serviceTaskdiag.setIcd10code(serviceTaskVO.getIcd10code()); serviceTaskdiag.setLongtask(1L); serviceTaskdiag.setIcd10name(serviceTaskVO.getIcd10name()); serviceTaskdiag.setGuid(serviceTask.getGuid()); serviceTaskdiag.setOrgid(serviceTask.getOrgid()); serviceTaskdiag.setUpdateTime(new Date()); if (StringUtils.isNotEmpty(serviceTaskVO.getIcd10code())) { String[] icd10codes = serviceTaskVO.getIcd10code().split(","); for (String icdcode : icd10codes) { //先查询一下是否存在 ServiceTaskdiag serviceTaskdiag2 = new ServiceTaskdiag(); serviceTaskdiag2.setTaskId(serviceTaskVO.getTaskid()); serviceTaskdiag2.setIcd10code(icdcode); List<ServiceTaskdiag> serviceTaskdiags = serviceTaskdiagService.selectServiceTaskdiagList(serviceTaskdiag2); serviceTaskdiag.setIcd10code(icdcode); log.error("----serviceTaskdiag更新的值为：{}", serviceTaskdiag); if (CollectionUtils.isNotEmpty(serviceTaskdiags)) { serviceTaskdiag.setId(serviceTaskdiags.get(0).getId()); @@ -560,21 +582,33 @@ } else { serviceTaskdiagService.insertServiceTaskdiag(serviceTaskdiag); } } } } else if (serviceTaskVO.getAppltype().equals("4")) { ServiceTaskoper serviceTaskoper = new ServiceTaskoper(); if (StringUtils.isEmpty(serviceTaskVO.getOpcode())) { throw new BaseException("手术编码为空"); } serviceTaskoper.setOpcode(serviceTaskVO.getOpcode()); // serviceTaskoper.setOpcode(serviceTaskVO.getOpcode()); serviceTaskoper.setOpdesc(serviceTaskVO.getOpdesc()); serviceTaskoper.setTaskId(serviceTask.getTaskid()); List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper); serviceTaskoper.setTaskName(serviceTask.getTaskName()); serviceTaskoper.setLongtask(1L); serviceTaskoper.setGuid(serviceTask.getGuid()); serviceTaskoper.setOrgid(serviceTask.getOrgid()); serviceTaskoper.setCreateTime(new Date()); if (StringUtils.isNotEmpty(serviceTaskVO.getOpcode())) { String[] opcodes = serviceTaskVO.getOpcode().split(","); for (String opcode : opcodes) { //先查询一下是否存在 ServiceTaskoper serviceTaskoper2 = new ServiceTaskoper(); serviceTaskoper2.setTaskId(serviceTaskVO.getTaskid()); serviceTaskoper2.setOpcode(serviceTaskVO.getOpcode()); List<ServiceTaskoper> serviceTaskopers = serviceTaskoperService.selectServiceTaskoperList(serviceTaskoper2); serviceTaskoper.setOpcode(opcode); log.error("----serviceTaskoper的值为：{}", serviceTaskoper); if (CollectionUtils.isNotEmpty(serviceTaskopers)) { serviceTaskoper.setId(serviceTaskopers.get(0).getId()); @@ -583,6 +617,9 @@ serviceTaskoperService.insertServiceTaskoper(serviceTaskoper); } } } } if (ObjectUtils.isNotEmpty(serviceTaskVO.getIvrTaskTemplateVO())) { IvrTaskTemplate ivrTaskTemplate = new IvrTaskTemplate(); ivrTaskTemplate.setTaskid(serviceTaskVO.getIvrTaskTemplateVO().getTaskid()); smartor/src/main/resources/mapper/smartor/ServiceTaskMapper.xml
@@ -248,18 +248,18 @@ service_task.orgid from service_task <where> service_task.del_flag=0 and taskid in ( select task_id from service_taskdept <where> <if test="leaveldeptcodes != null and leaveldeptcodes.size()>0"> dept_code in <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator="," close=")"> #{leaveldeptcode} </foreach> </if> </where> ) <!-- and taskid in (--> <!-- select task_id from service_taskdept--> <!-- <where>--> <!-- <if test="leaveldeptcodes != null and leaveldeptcodes.size()>0">--> <!-- dept_code in--> <!-- <foreach collection="leaveldeptcodes" item="leaveldeptcode" open="(" separator=","--> <!-- close=")">--> <!-- #{leaveldeptcode}--> <!-- </foreach>--> <!-- </if>--> <!-- </where>--> <!-- )--> <if test="taskName != null and taskName != ''">and service_task.task_name like concat('%', #{taskName}, '%') </if> smartor/src/main/resources/mapper/smartor/ServiceTaskdiagMapper.xml
@@ -45,6 +45,7 @@ resultMap="ServiceTaskdiagResult"> <include refid="selectServiceTaskdiagVo"/> <where> del_flag=0 <if test="taskId != null "> and task_id = #{taskId} </if> smartor/src/main/resources/mapper/smartor/ServiceTaskoperMapper.xml
@@ -23,7 +23,21 @@ </resultMap> <sql id="selectServiceTaskoperVo"> select id, task_id, longtask, task_name, service_type, opid, opcode, opdesc, del_flag, create_time, update_time, orgid, guid, pguid, pid select id, task_id, longtask, task_name, service_type, opid, opcode, opdesc, del_flag, create_time, update_time, orgid, guid, pguid, pid from service_taskoper </sql> @@ -31,6 +45,7 @@ resultMap="ServiceTaskoperResult"> <include refid="selectServiceTaskoperVo"/> <where> del_flag=0 <if test="taskId != null "> and task_id = #{taskId} </if> @@ -73,7 +88,8 @@ where id = #{id} </select> <insert id="insertServiceTaskoper" parameterType="com.smartor.domain.ServiceTaskoper" useGeneratedKeys="true" keyProperty="id"> <insert id="insertServiceTaskoper" parameterType="com.smartor.domain.ServiceTaskoper" useGeneratedKeys="true" keyProperty="id"> insert into service_taskoper <trim prefix="(" suffix=")" suffixOverrides=","> <if test="taskId != null">task_id, @@ -204,8 +220,6 @@ #{id} </foreach> </update> </mapper>
