Browse Source

优化检查打印获取标题等

xiaochan 2 years ago
parent
commit
019ce1364a

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

@@ -122,6 +122,9 @@ public class JianYanJianChaShenQingService {
             jc = new JcZdClass();
             jc.setComm("检查申请单");
         }
+        if (StringUtil.isBlank(jc.getComm())) {
+            jc.setComm("检查申请单");
+        }
 
         if (req.getReqType().trim().equals("2") && req.getClasses() != null && req.getClasses().equals("038")) {
             jc = new JcZdClass();

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

@@ -34,16 +34,11 @@ public class OrderQuashService {
     }
 
     public ResultVo<Integer> applicationForRevocation(ReqOrderQuash param) {
-
-
         Date orderDate = dao.selectOrderStartTime(param.getActOrderNo());
-
         if (orderDate == null) {
-            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "原医嘱不存在。");
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "原医嘱不存在。");
         }
-
         Date now = new Date();
-
         param.setReqId(TokenUtil.getTokenUserId())
                 .setReqDatetime(now);
 
@@ -53,7 +48,8 @@ public class OrderQuashService {
         if (subtract > 24) {
             return insertTheRequest(param);
         }
-        /// 有费用要申请
+
+        // 有费用要申请
         if (dao.selectzyDetailCharge(param.getActOrderNo(), param.getPatNo(), param.getTimes()) > 0) {
             return insertTheRequest(param);
         }