Bladeren bron

加强校验,实体类大写

xiaochan 1 jaar geleden
bovenliggende
commit
f799f634af

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

@@ -1,6 +1,5 @@
 package thyyxxk.webserver.controller.zhuyuanyizheng;
 
-import cn.hutool.log.Log;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.validation.annotation.Validated;
@@ -211,7 +210,7 @@ public class YizhuLuRuController {
     }
 
     @PostMapping("/copyOrder")
-    public ResultVo<JSONObject> copyOrder(@RequestBody copyOrder copyOrder) {
+    public ResultVo<JSONObject> copyOrder(@RequestBody CopyOrder copyOrder) {
         return server.copyOrder(copyOrder);
     }
 

+ 1 - 1
src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/yizhuluru/copyOrder.java → src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/yizhuluru/CopyOrder.java

@@ -5,7 +5,7 @@ import lombok.Data;
 import java.math.BigDecimal;
 
 @Data
-public class copyOrder {
+public class CopyOrder {
     private BigDecimal actOrderNo;
 
     private String frequCode;

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

@@ -1,20 +1,17 @@
 package thyyxxk.webserver.service.zhuyuanyisheng;
 
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.ListUtils;
 import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 import thyyxxk.webserver.config.exception.BizException;
 import thyyxxk.webserver.config.exception.ExceptionEnum;
 import thyyxxk.webserver.constants.sidicts.ChargeStatus;
@@ -1309,7 +1306,7 @@ public class YiZhuLuRuServer {
     }
 
 
-    public ResultVo<JSONObject> copyOrder(copyOrder copyOrder) {
+    public ResultVo<JSONObject> copyOrder(CopyOrder copyOrder) {
         QueryWrapper<?> qw = new QueryWrapper<>();
         qw.eq("a.act_order_no", copyOrder.getActOrderNo());
         List<XinZhenYzActOrder> yiZhuList = dao.selectOrderNo(qw);
@@ -1331,7 +1328,7 @@ public class YiZhuLuRuServer {
         orderList.add(fatherOrder.getActOrderNo());
         // 查询子医嘱
         QueryWrapper<?> childQw = new QueryWrapper<>();
-        // 根据父医嘱的住院号和住院次数查询医嘱,设置默认值会重新生成 actOrderNo ,所以需要使用 copyOrder 中的 actOrderNo
+        // 根据父医嘱的住院号和住院次数查询医嘱,设置默认值会重新生成 actOrderNo ,所以需要使用 CopyOrder 中的 actOrderNo
         childQw.eq("a.parent_no", copyOrder.getActOrderNo());
         childQw.eq("a.inpatient_no", fatherOrder.getInpatientNo());
         childQw.eq("a.admiss_times", fatherOrder.getAdmissTimes());

+ 18 - 15
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/yizhuverify/YiZhuCheckData.java

@@ -180,7 +180,24 @@ public class YiZhuCheckData {
             errorMessage.add("药房错误,请重新选择药房。");
         }
 
+        if (StringUtil.isBlank(item.getDrugSpecification())) {
+            errorMessage.add("药品规格不能为空");
+        }
+        if (StringUtil.isBlank(item.getSupplyCode())) {
+            errorMessage.add("给药方式不能为空");
+        }
+        if (item.getDose() == null || BigUtils.dengYu(item.getDose(), 0)) {
+            errorMessage.add("一次计量不能为空");
+        }
+        if (StringUtil.isBlank(item.getDoseUnit())) {
+            errorMessage.add("计量单位不能为空");
+        }
+        if (StringUtil.isBlank(item.getSerial())) {
+            errorMessage.add("包装大小不能为空");
+        }
+
         if (detailsOfDrugs == null) {
+            errorMessage.add("没有找到对应的药品,请联系药房。");
             return;
         }
 
@@ -241,21 +258,7 @@ public class YiZhuCheckData {
             calculateDrugAmount(item, detailsOfDrugs);
         }
 
-        if (StringUtil.isBlank(item.getDrugSpecification())) {
-            errorMessage.add("药品规格不能为空");
-        }
-        if (StringUtil.isBlank(item.getSupplyCode())) {
-            errorMessage.add("给药方式不能为空");
-        }
-        if (item.getDose() == null || BigUtils.dengYu(item.getDose(), 0)) {
-            errorMessage.add("一次计量不能为空");
-        }
-        if (StringUtil.isBlank(item.getDoseUnit())) {
-            errorMessage.add("计量单位不能为空");
-        }
-        if (StringUtil.isBlank(item.getSerial())) {
-            errorMessage.add("包装大小不能为空");
-        }
+
 
     }