未分诊添加检索

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>13.6.5</version>
+    <version>13.6.8</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

src/main/java/thyyxxk/webserver/controller/outpatient/triage/TriageController.java

@@ -37,9 +37,8 @@ public class TriageController {
     }
 
     @GetMapping("/getUnTriagedPatients")
-    public ResultVo<Map<String, Object>> getUnTriagedPatients(@RequestParam("currentPage") Integer currentPage,
-                                                              @RequestParam("pageSize") Integer pageSize) {
-        return service.getUnTriagedPatients(currentPage, pageSize);
+    public ResultVo<Map<String, Object>> getUnTriagedPatients() {
+        return service.getUnTriagedPatients();
     }
 
     @GetMapping("/getPatientIdByIdNo")

src/main/java/thyyxxk/webserver/dao/his/outpatient/triage/TriageDao.java

@@ -57,7 +57,7 @@ public interface TriageDao {
             "#{deptCode}" +
             "</foreach>" +
             "</script>")
-    IPage<MzfzPatientOrder> getUnTriagedPatients(IPage<MzfzPatientOrder> iPage, @Param("deptCodes") String[] deptCodes);
+    List<MzfzPatientOrder> getUnTriagedPatients(@Param("deptCodes") String[] deptCodes);
 
     // 获取已分诊病人
     @Select("<script>" +

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyiji/MedicineManagementDao.java

@@ -53,8 +53,8 @@ public interface MedicineManagementDao {
             "from zy_detail_charge a left join a_patient_mi d on a.inpatient_no=d.inpatient_no " +
             "left join zy_actpatient e on a.inpatient_no=e.inpatient_no,zd_unit_code c, " +
             "(select name,specification2,code,drug_flag from yp_zd_dict where drug_flag>0 group by code,name,specification2,drug_flag) b " +
-            "where a.gen_time>=#{start} and a.gen_time<=#{end} and a.exec_unit=#{dept} and " +
-            "a.charge_code_mx=b.code and a.exec_unit=c.code " +
+            "where a.gen_time>=#{start} and a.gen_time<=#{end} and a.exec_unit=#{dept} and a.ledger_sn>0 " +
+            "and a.charge_code_mx=b.code and a.exec_unit=c.code " +
             "union all " +
             "select convert(varchar(5),a.charge_date,10) as chargeDate,b.name as chargeName,'麻醉科' as deptName,rtrim(d.name) as patName, " +
             "patGender=case when isnull(d.sex,'')='' then '' when d.sex='1'then '男'else '女'end, " +

src/main/java/thyyxxk/webserver/service/outpatient/triage/TriageService.java

@@ -53,18 +53,15 @@ public class TriageService {
         return dao.getBigScreenFooter();
     }
 
-    public ResultVo<Map<String, Object>> getUnTriagedPatients(Integer currentPage, Integer pageSize) {
+    public ResultVo<Map<String, Object>> getUnTriagedPatients() {
         String[] depts = StringUtil.triageDeptString2Array(dao.selectChosenDepts(TokenUtil.getInstance().getTokenUserId()));
         if (depts.length == 0) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请先前往【科室设置】分配分诊科室！");
         }
         Map<String, Object> map = new HashMap<>(Capacity.TWO);
-        IPage<MzfzPatientOrder> iPage = new Page<>(currentPage, pageSize);
-        iPage = dao.getUnTriagedPatients(iPage, depts);
-
-        List<MzfzPatientOrder> list = iPage.getRecords();
+        List<MzfzPatientOrder> list = dao.getUnTriagedPatients(depts);
         fillGenderAndAge(list);
-        map.put("totalSize", iPage.getTotal());
+        map.put("totalSize", list.size());
         map.put("list", list);
         return ResultVoUtil.success(map);
     }