ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/SvyLibTemplateController.java
@@ -50,6 +50,7 @@ } @ApiOperation("查询问卷列表通过部门病区代码") @AddOrgId(field = "orgid", paramIndex = 0, campusField = "campusid") @PostMapping("/getSviLibTemplateByDeptCode") public Map<String, Object> getSviLibTemplateByDeptCode(@RequestBody TemplateDeptVO templateDeptVO) { templateDeptVO.setPageNum(PageUtils.getOffset(templateDeptVO.getPageNum(), templateDeptVO.getPageSize())); smartor/src/main/java/com/smartor/domain/PatMedInhosp.java
@@ -390,7 +390,7 @@ /** * 出入院标识 */ @ApiModelProperty("出入院标识：0入院 1出院 ") @ApiModelProperty("出入院标识：0入院 1出院 2 转科 3 预入院") private Integer cry; /** smartor/src/main/java/com/smartor/service/impl/PatMedInhospServiceImpl.java
@@ -98,14 +98,18 @@ */ @Override public List<PatMedInhosp> selectPatMedInhospList(PatMedInhosp patMedInhosp) { if (patMedInhosp.getCry() == 0) { if (patMedInhosp.getCry() != null && patMedInhosp.getCry() == 0) { patMedInhosp.setDeptcodeList(patMedInhosp.getLeaveldeptcodes()); patMedInhosp.setHospitaldistrictcodeList(patMedInhosp.getLeavehospitaldistrictcodes()); patMedInhosp.setLeaveldeptcodes(null); patMedInhosp.setLeavehospitaldistrictcodes(null); patMedInhosp.setInhospstate("0"); } else if (patMedInhosp.getCry() == 1) { } else if (patMedInhosp.getCry() != null && patMedInhosp.getCry() == 1) { patMedInhosp.setInhospstate("1"); } else if (patMedInhosp.getCry() != null && patMedInhosp.getCry() == 2) { patMedInhosp.setInhospstate("2"); } else if (patMedInhosp.getCry() != null && patMedInhosp.getCry() == 3) { patMedInhosp.setInhospstate("3"); } List<PatMedInhosp> patMedInhospList = patMedInhospMapper.selectPatMedInhospList(patMedInhosp); smartor/src/main/java/com/smartor/service/impl/ServiceSubtaskServiceImpl.java
@@ -410,6 +410,13 @@ serviceSubtaskRes.setSendstateView(1L); if (serviceSubtaskRes.getSendstate() == 6) serviceSubtaskRes.setSendstateView(2L); if (serviceSubtaskRes.getSendstate() == 4) serviceSubtaskRes.setSendstateView(3L); // 填充当前补偿 if (StringUtils.isEmpty(serviceSubtask.getCurrentPreachform())){ if(StringUtils.isNotEmpty(serviceSubtask.getPreachform())){ //默认取第一个 serviceSubtaskRes.setCurrentPreachform(serviceSubtask.getPreachform().split(",")[0]); } } serviceSubtaskResList.add(serviceSubtaskRes); } return serviceSubtaskResList; smartor/src/main/resources/mapper/smartor/PatMedInhospMapper.xml
@@ -263,6 +263,8 @@ <if test="diagcheckFlag != null ">and b.diagcheck_flag = #{diagcheckFlag}</if> <if test="cry != null and cry == 0 ">and b.endtime is null</if> <if test="cry != null and cry == 1 ">and b.inhospstate=1</if> <if test="cry != null and cry == 2 ">and b.inhospstate=2</if> <if test="cry != null and cry == 3 ">and b.inhospstate=3</if> <if test="inhospstate != null ">and b.inhospstate = #{inhospstate}</if> <if test="campusid != null ">and b.campusid = #{campusid}</if> <if test="schemestatus != null ">and b.schemestatus = #{schemestatus}</if> @@ -328,10 +330,16 @@ a.telcode, a.id, a.sex <if test="cry==1"> <if test="cry != null and cry==1"> order by b.endtime desc </if> <if test="cry==0"> <if test="cry != null and cry==2"> order by b.endtime desc </if> <if test="cry != null and cry==3"> order by b.endtime desc </if> <if test="cry != null and cry==0"> order by b.starttime desc </if> </select> smartor/src/main/resources/mapper/smartor/SvyLibTemplateMapper.xml
@@ -179,6 +179,7 @@ AND a.svyid = b.tempid where a.del_flag=0 and b.del_flag=0 <if test="orgid != null and orgid != ''">and a.orgid = #{orgid}</if> <if test="deptCode != null ">and b.dept_code = #{deptCode}</if> <if test="deptType != null ">and b.dept_type = #{deptType}</if> <if test="type != null">and b.type=#{type}</if>
