ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -215,27 +215,37 @@ @GetMapping("/cSWebGetProByTjNumAndOrderId") @ApiOperation(value = "(初审页面)点击体检人员展示体检项目接口") public AjaxResult cSWebGetProByTjNumAndOrderId(@ApiParam(value = "体检号") @RequestParam String tjNumber) { List<TjOrderRemark> orderRemarkList = orderRemarkService.getTjOrderRemarkListByTjNum(tjNumber); List<CsProVo> list = new ArrayList<>(); if (null != orderRemarkList && orderRemarkList.size() > 0) { for (TjOrderRemark remark : orderRemarkList) { CsProVo vo = new CsProVo(); vo.setDeptName(deptService.getById(remark.getDeptId()).getDeptName()); vo.setProName(projectService.getById(remark.getProId()).getProName()); vo.setType(remark.getType()); if (null != remark.getDoctorName()) { vo.setDoctorName(userService.getById(remark.getDoctorName()).getNickName()); vo.setBcdoctorName(userService.getById(remark.getDoctorName()).getNickName()); } vo.setSffs("统收"); vo.setIsPay("已收费"); vo.setQdcreateTime(remark.getCreateTime()); vo.setBcupdateTime(remark.getUpdateTime()); vo.setZhupdateTime(remark.getUpdateTime()); list.add(vo); } // List<TjOrderRemark> orderRemarkList = orderRemarkService.getTjOrderRemarkListByTjNum(tjNumber); // List<CsProVo> list = new ArrayList<>(); // if (null != orderRemarkList && orderRemarkList.size() > 0) { // for (TjOrderRemark remark : orderRemarkList) { // CsProVo vo = new CsProVo(); // vo.setDeptName(deptService.getById(remark.getDeptId()).getDeptName()); // vo.setProName(projectService.getById(remark.getProId()).getProName()); // vo.setType(remark.getType()); // if (null != remark.getDoctorName()) { // vo.setDoctorName(userService.getById(remark.getDoctorName()).getNickName()); // vo.setBcdoctorName(userService.getById(remark.getDoctorName()).getNickName()); // } // vo.setSffs("统收"); // vo.setIsPay("已收费"); // vo.setQdcreateTime(remark.getCreateTime()); // vo.setBcupdateTime(remark.getUpdateTime()); // vo.setZhupdateTime(remark.getUpdateTime()); // list.add(vo); // } // List<CsProVo> list1 = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber); // Collections.sort(list, new Comparator<CsProVo>() { // @Override // public int compare(CsProVo o1, CsProVo o2) { // return o1.getType() - o2.getType(); // } // }); // } Collections.sort(list, new Comparator<CsProVo>() { List<CsProVo> list = orderRemarkService.cSWebGetProByTjNumAndOrderId(tjNumber); if(null !=list && list.size()>0){ list.sort(new Comparator<CsProVo>() { @Override public int compare(CsProVo o1, CsProVo o2) { return o1.getType() - o2.getType(); ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjOrderRemarkMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ltkj.hosp.domain.TjOrderRemark; import com.ltkj.hosp.vodomain.CsProVo; import org.apache.ibatis.annotations.*; /** @@ -84,4 +85,26 @@ "LEFT JOIN tj_order_remark b ON a.pro_id=b.pro_id " + "WHERE b.type !=2 AND b.pro_id != a.pro_id AND a.pac_id=#{pacId} AND b.tj_number=#{tjNumber}") List<Long> getTjProIdsByTjNumAndPacIc1(@Param("tjNumber") String tjNumber,@Param("pacId") String pacId); @Select("SELECT\n" + "\tdep.dept_name,\n" + "\tpro.pro_name,\n" + "\tre.type,\n" + "\tus.nick_name doctor_name,\n" + "\tus.nick_name bcdoctor_name,\n" + "\t'统收' sffs,\n" + "\t'已收费' is_pay,\n" + "\tre.create_time qdcreate_time,\n" + "\tre.update_time bcupdate_time,\n" + "\tre.update_time zhupdate_time \n" + "FROM\n" + "\ttj_order_remark re\n" + "\tLEFT JOIN sys_dept dep ON re.dept_id = dep.dept_id\n" + "\tLEFT JOIN tj_project pro ON re.pro_id = pro.pro_id\n" + "\tLEFT JOIN sys_user us ON us.user_id = re.doctor_name \n" + "WHERE\n" + "\tre.type != 2 \n" + "\tAND re.tj_number =#{tjNumber}") List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITjOrderRemarkService.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ltkj.hosp.domain.TjOrderDetail; import com.ltkj.hosp.domain.TjOrderRemark; import com.ltkj.hosp.vodomain.CsProVo; import java.util.List; @@ -38,4 +39,7 @@ List<Long> getTjProIdsByTjNumAndPacIc(String tjNumber,String pacId); List<Long> getTjProIdsByTjNumAndPacIc1(String tjNumber,String pacId); List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber); } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java
@@ -5,6 +5,7 @@ import com.ltkj.hosp.domain.TjOrderRemark; import com.ltkj.hosp.mapper.TjOrderRemarkMapper; import com.ltkj.hosp.service.ITjOrderRemarkService; import com.ltkj.hosp.vodomain.CsProVo; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -76,4 +77,9 @@ return mapper.getTjProIdsByTjNumAndPacIc1(tjNumber,pacId); } @Override public List<CsProVo> cSWebGetProByTjNumAndOrderId(String tjNumber) { return mapper.cSWebGetProByTjNumAndOrderId(tjNumber); } } ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderServiceImpl.java
@@ -231,8 +231,8 @@ map.put("tjNumber",tjNumber); map.put("compId",compId); map.put("tjname",tjname); map.put("beginTime", DateUtil.beginOfDay(DateUtil.parse(beginTime))); map.put("endTime",DateUtil.beginOfDay(DateUtil.parse(endTime))); map.put("beginTime",beginTime); map.put("endTime",endTime); List<List<?>> list = tjOrderMapper.getCunChuGuoChengCustomerList(map); Map<String,Object> map1=new HashMap<>(); map1.put("customers",list); @@ -250,8 +250,8 @@ map.put("tjNumber",tjNumber); map.put("compId",compId); map.put("tjname",tjname); map.put("beginTime", DateUtil.beginOfDay(DateUtil.parse(beginTime))); map.put("endTime",DateUtil.beginOfDay(DateUtil.parse(endTime))); map.put("beginTime",beginTime); map.put("endTime",endTime); List<List<?>> list = tjOrderMapper.getCsCunChuGuoChengCustomerList(map); Map<String,Object> map1=new HashMap<>(); map1.put("customers",list);
