1、危急值新增前往处理 2、 草药医嘱去掉发药未发药筛选

src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/CaoYaoYiZhuController.java

@@ -36,7 +36,7 @@ public class CaoYaoYiZhuController {
 
     @PostMapping("/huoQuCaoYaoShuJu")
     @PassToken
-    public ResultVo<IPage<YzActOrderCy>> huoQuCaoYaoShuJu(@RequestBody @Validated CaoYaoChaXunTiaoJian param) {
+    public ResultVo<List<YzActOrderCy>> huoQuCaoYaoShuJu(@RequestBody @Validated CaoYaoChaXunTiaoJian param) {
         return server.huoQuCaoYaoShuJu(param);
     }
 

src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/CriticalValuesController.java

@@ -35,12 +35,9 @@ public class CriticalValuesController {
     }
 
     @GetMapping("/getCriticalValues")
-    public ResultVo<List<CriticalValue>> getCriticalValues(@RequestParam("patNo") String patNo) {
-        List<CriticalValue> list = service.getCriticalValues(patNo);
-        if (list.isEmpty()) {
-            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
-        }
-        return ResultVoUtil.success(list);
+    public ResultVo<List<CriticalValue>> getCriticalValues(@RequestParam("patNo") String patNo,
+                                                           @RequestParam("id") Integer id) {
+        return service.getCriticalValues(patNo, id);
     }
 
     @GetMapping("/handleZyCriticalValue")

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/CaoYaoYiZhuDao.java

@@ -46,8 +46,7 @@ public interface CaoYaoYiZhuDao {
             "       exec_dept_name = (select name from zd_unit_code where code = exec_dept) " +
             "from yz_act_order_cy with (NOLOCK) " +
             "${ew.customSqlSegment} ")
-    IPage<YzActOrderCy> huoQuCaoYaoShuJu(IPage<YzActOrderCy> page,
-                                         @Param(Constants.WRAPPER) Wrapper<?> wp);
+    List<YzActOrderCy> huoQuCaoYaoShuJu(@Param(Constants.WRAPPER) Wrapper<?> wp);
 
 
     /**

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/PatientCriticalValuesDao.java

@@ -60,6 +60,11 @@ public interface PatientCriticalValuesDao {
             "from t_critical_message where pat_no=#{patNo}")
     List<CriticalValue> selectCriticalValuesByPatNo(String patNo);
 
+    @Select("select *, " +
+            "handleStaffName=(select rtrim(d.name) from a_employee_mi d where d.code=handle_staff) " +
+            "from t_critical_message where id=#{id}")
+    List<CriticalValue> selectCriticalValuesById(Integer id);
+
     @Update("update t_critical_message set handle_time=getdate(), " +
             "handle_staff=#{staff} where id=#{id} ")
     int handleZyCriticalValue(Integer id, String staff);

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/CaoYaoYiZhuService.java

@@ -57,27 +57,24 @@ public class CaoYaoYiZhuService {
         this.hospitalizationCostsService = hospitalizationCostsService;
     }
 
-    public ResultVo<IPage<YzActOrderCy>> huoQuCaoYaoShuJu(CaoYaoChaXunTiaoJian param) {
-        IPage<YzActOrderCy> page = new Page<>(param.getCurrentPage(), param.getPageSize(), param.getTotal() == 0);
+    public ResultVo<List<YzActOrderCy>> huoQuCaoYaoShuJu(CaoYaoChaXunTiaoJian param) {
         QueryWrapper<?> qw = new QueryWrapper<>();
         qw.eq("inpatient_no", param.getPatNo());
         qw.eq("admiss_times", param.getTimes());
-        if (param.getShiFouFaYao()) {
-            qw.eq("status_flag", "4");
-        } else {
-            qw.le("status_flag", "3");
-        }
+        qw.orderByDesc("input_date");
         if (StringUtil.notBlank(param.getStartTime())) {
             qw.ge("input_date", param.getStartTime());
             qw.le("input_date", param.getEndTime());
         }
-        dao.huoQuCaoYaoShuJu(page, qw);
-        for (YzActOrderCy item : page.getRecords()) {
-            item.setDaiJianFei(item.getQuantityDj().multiply(item.getOrderJeDj()));
-            item.setJiaGe(item.getQuantity().multiply(item.getOrderJe()));
-            item.setZongJia(item.getDaiJianFei().add(item.getJiaGe()));
+        List<YzActOrderCy> list = dao.huoQuCaoYaoShuJu(qw);
+        if (ListUtil.notBlank(list)) {
+            for (YzActOrderCy item : list) {
+                item.setDaiJianFei(item.getQuantityDj().multiply(item.getOrderJeDj()));
+                item.setJiaGe(item.getQuantity().multiply(item.getOrderJe()));
+                item.setZongJia(item.getDaiJianFei().add(item.getJiaGe()));
+            }
         }
-        return ResultVoUtil.success(page);
+        return ResultVoUtil.success(list);
     }
 
     public ResultVo<List<YzActOrderCyDetail>> huoQuChaoYaoMingXi(BigDecimal orderNo) {

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/PatientCriticalValuesService.java

@@ -221,11 +221,20 @@ public class PatientCriticalValuesService {
         return ResultVoUtil.success();
     }
 
-    public List<CriticalValue> getCriticalValues(String patNo) {
+    public ResultVo<List<CriticalValue>> getCriticalValues(String patNo, Integer id) {
+        if (id != null) {
+            return ResultVoUtil.success(dao.selectCriticalValuesById(id));
+        }
+        List<CriticalValue> list;
         if (StringUtil.isBlank(patNo)) {
-            return dao.selectAllInpatientCriticalValues();
+            list = dao.selectAllInpatientCriticalValues();
+        } else {
+            list = dao.selectCriticalValuesByPatNo(patNo);
+        }
+        if (list.isEmpty()) {
+            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
         }
-        return dao.selectCriticalValuesByPatNo(patNo);
+        return ResultVoUtil.success(list);
     }
 
     public ResultVo<String> handleZyCriticalValue(Integer id) {