瀏覽代碼

查看婴儿

DESKTOP-0GD05B0\Administrator 2 年之前
父節點
當前提交
3d3268592e

+ 3 - 2
src/main/java/thyyxxk/webserver/controller/inpatient/PatientController.java

@@ -25,8 +25,9 @@ public class PatientController {
     }
 
     @GetMapping("/getOverView")
-    public ResultVo<List<Overview>> getOverView(@RequestParam("ward") String ward) {
-        return service.getOverView(ward);
+    public ResultVo<List<Overview>> getOverView(@RequestParam("ward") String ward,
+                                                @RequestParam("viewBabies") Boolean viewBabies) {
+        return service.getOverView(ward,viewBabies);
     }
 
     @GetMapping("/getInfo")

+ 3 - 2
src/main/java/thyyxxk/webserver/dao/his/inpatient/PatientDao.java

@@ -37,10 +37,11 @@ public interface PatientDao {
             "                   (select name from a_employee_mi where code = refer_physician) as consult_physician_name, " +
             "                   dept_director, " +
             "                   (select name from a_employee_mi where code = refer_physician) as dept_director_name " +
-            "from zy_actpatient a where a.ward like #{ward} and charindex('$',a.inpatient_no)=0 " +
+            "from zy_actpatient a where a.ward like #{ward} ${sql} " +
             "ORDER BY cast(a.bed_no AS int)")
     List<Overview> getOverView(@Param("ward") String ward,
-                               @Param("userCode") String userCode);
+                               @Param("userCode") String userCode,
+                               @Param("sql") String sql);
 
     @Select("<script>" +
             "select inpatientNo=rtrim(a.inpatient_no),a.admiss_times,a.med_type,b.social_no,dis_date," +

+ 6 - 2
src/main/java/thyyxxk/webserver/service/inpatient/PatientService.java

@@ -47,9 +47,13 @@ public class PatientService {
         this.redis = redis;
     }
 
-    public ResultVo<List<Overview>> getOverView(String ward) {
+    public ResultVo<List<Overview>> getOverView(String ward, Boolean viewBabies) {
         ward = "%" + ward + "%";
-        return ResultVoUtil.success(dao.getOverView(ward, TokenUtil.getTokenUserId()));
+        String sql = "";
+        if (!viewBabies) {
+            sql = "and charindex('$',a.inpatient_no)=0 ";
+        }
+        return ResultVoUtil.success(dao.getOverView(ward, TokenUtil.getTokenUserId(), sql));
     }
 
     public ResultVo<Patient> getPatientInfo(String inpatientNo) {