Browse Source

住院医生

DESKTOP-0GD05B0\Administrator 2 years ago
parent
commit
2f3e9194cb

+ 1 - 1
src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/YizhuLuRuController.java

@@ -99,7 +99,7 @@ public class YizhuLuRuController {
     }
 
     @PostMapping("/deleteMultipleOrders")
-    public ResultVo<Map<BigDecimal, String>> deleteMultipleOrders(@RequestBody XinZhenYiZhu param) {
+    public ResultVo<Map<String, String>> deleteMultipleOrders(@RequestBody XinZhenYiZhu param) {
         if (StringUtil.isBlank(param.getInpatientNo())) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请选择患者.");
         }

+ 2 - 0
src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/yizhuluru/XinZhenYzActOrder.java

@@ -22,9 +22,11 @@ public class XinZhenYzActOrder {
 
     /**
      * 可以用来做父子医嘱
+     * 以及 actOrderNo 的id
      */
     private String id;
 
+
     private String inpatientNo;
     private Integer admissTimes;
 

+ 3 - 3
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -428,7 +428,7 @@ public class YiZhuLuRuServer {
      * @param param 参数
      * @return 返回提示
      */
-    public ResultVo<Map<BigDecimal, String>> deleteMultipleOrders(XinZhenYiZhu param) {
+    public ResultVo<Map<String, String>> deleteMultipleOrders(XinZhenYiZhu param) {
         QueryWrapper<?> qw = new QueryWrapper<>();
         qw.eq("inpatient_no", param.getInpatientNo());
         qw.eq("admiss_times", param.getAdmissTimes());
@@ -441,11 +441,11 @@ public class YiZhuLuRuServer {
         if (ListUtil.isBlank(deleteOrderList)) {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "没有找到原医嘱可能已经被删除了");
         }
-        Map<BigDecimal, String> map = new HashMap<>();
+        Map<String, String> map = new HashMap<>();
         deleteOrderList.forEach(item -> {
             String error = judgeWhetherItCanBeDeleted(item);
             if (StringUtil.notBlank(error)) {
-                map.put(item.getActOrderNo(), error);
+                map.put(item.getActOrderNo().stripTrailingZeros().toPlainString(), error);
             }
         });