fix:[模板管理]优化

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java

@@ -915,10 +915,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         Date now = new Date();
         for (Gyzj gyzj : gyzjList) {
             //验证库存
-            BigDecimal kc = new BigDecimal(gyzj.getKc());
-            if (kc.compareTo(BigDecimal.ZERO) <= 0) {
-                throw new ServiceException("给药制剂【" + gyzj.getMc() + "】库存不足，不能发放");
-            }
+//            BigDecimal kc = new BigDecimal(gyzj.getKc());
+//            if (kc.compareTo(BigDecimal.ZERO) <= 0) {
+//                throw new ServiceException("给药制剂【" + gyzj.getMc() + "】库存不足，不能发放");
+//            }
             List<FfForm> plffItemFilter = form.getList().stream()
                     .filter(p -> p.getId().equals(gyzj.getId()))
                     .collect(Collectors.toList());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjTzServiceImpl.java

@@ -112,18 +112,31 @@ public class GyzjTzServiceImpl extends ServiceImpl impleme
             gyzjTz.setLqrMc(lqr1.getNickName() +","+ lqr2.getNickName());
             gyzjTz.setLqrMcEn(lqr1.getUserName() +","+ lqr2.getUserName());
         }
+        else{
+            gyzjTz.setLqrMc(lqr1.getNickName());
+            gyzjTz.setLqrMcEn(lqr1.getUserName());
+        }
 
         if (ghr1 != null && ghr2 != null) {
             gyzjTz.setGhrMc(ghr1.getNickName() +","+ ghr2.getNickName());
             gyzjTz.setGhrMcEn(ghr1.getUserName() +","+ ghr2.getUserName());
+        }else {
+            gyzjTz.setGhrMc(ghr1.getNickName());
+            gyzjTz.setGhrMcEn(ghr1.getUserName());
         }
         if (ffr1 != null && ffr2 != null) {
             gyzjTz.setFfrMc(ffr1.getNickName() +","+ ffr2.getNickName());
             gyzjTz.setFfrMcEn(ffr1.getUserName() +","+ ffr2.getUserName());
+        }else{
+            gyzjTz.setFfrMc(ffr1.getNickName());
+            gyzjTz.setFfrMcEn(ffr1.getUserName());
         }
         if (jsr1 != null && jsr2 != null) {
             gyzjTz.setJsrMc(jsr1.getNickName() +","+ jsr2.getNickName());
             gyzjTz.setJsrMcEn(jsr1.getUserName() +","+ jsr2.getUserName());
+        }else{
+            gyzjTz.setJsrMc(jsr1.getNickName());
+            gyzjTz.setJsrMcEn(jsr1.getUserName() );
         }
         if (qmr != null && qmr != null) {
             gyzjTz.setQmrId(qmr.getUserId());
@@ -164,18 +177,31 @@ public class GyzjTzServiceImpl extends ServiceImpl impleme
             gyzjTz.setLqrMc(lqr1.getNickName() +","+ lqr2.getNickName());
             gyzjTz.setLqrMcEn(lqr1.getUserName() +","+ lqr2.getUserName());
         }
+        else{
+            gyzjTz.setLqrMc(lqr1.getNickName());
+            gyzjTz.setLqrMcEn(lqr1.getUserName());
+        }
 
         if (ghr1 != null && ghr2 != null) {
             gyzjTz.setGhrMc(ghr1.getNickName() +","+ ghr2.getNickName());
             gyzjTz.setGhrMcEn(ghr1.getUserName() +","+ ghr2.getUserName());
+        }else {
+            gyzjTz.setGhrMc(ghr1.getNickName());
+            gyzjTz.setGhrMcEn(ghr1.getUserName());
         }
         if (ffr1 != null && ffr2 != null) {
             gyzjTz.setFfrMc(ffr1.getNickName() +","+ ffr2.getNickName());
             gyzjTz.setFfrMcEn(ffr1.getUserName() +","+ ffr2.getUserName());
+        }else{
+            gyzjTz.setFfrMc(ffr1.getNickName());
+            gyzjTz.setFfrMcEn(ffr1.getUserName());
         }
         if (jsr1 != null && jsr2 != null) {
             gyzjTz.setJsrMc(jsr1.getNickName() +","+ jsr2.getNickName());
             gyzjTz.setJsrMcEn(jsr1.getUserName() +","+ jsr2.getUserName());
+        }else{
+            gyzjTz.setJsrMc(jsr1.getNickName());
+            gyzjTz.setJsrMcEn(jsr1.getUserName() );
         }
         if (qmr != null && qmr != null) {
             gyzjTz.setQmrId(qmr.getUserId());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java

@@ -783,10 +783,10 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         Date now = new Date();
         for (Mjy mjy : mjyList) {
             //验证库存
-            BigDecimal kc = new BigDecimal(mjy.getKc());
-            if (kc.compareTo(BigDecimal.ZERO) <= 0) {
-                throw new ServiceException("麻精药【" + mjy.getMc() + "】库存不足，不能发放");
-            }
+//            BigDecimal kc = new BigDecimal(mjy.getKc());
+//            if (kc.compareTo(BigDecimal.ZERO) <= 0) {
+//                throw new ServiceException("麻精药【" + mjy.getMc() + "】库存不足，不能发放");
+//            }
             List<FfForm> plffItemFilter = form.getList().stream()
                     .filter(p -> p.getId().equals(mjy.getId()))
                     .collect(Collectors.toList());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java

@@ -39,6 +39,8 @@ public class MjyJcnrUtil {
         mapLang.put("复核人","Reviewer");
         mapLang.put("监督人","Supervisor");
         mapLang.put("钥匙1领取人","Key 1 User");
+        mapLang.put("领取人","User");
+        mapLang.put("领取人2","User 2");
         mapLang.put("钥匙2领取人","Key 2 User");
         mapLang.put("发放人","Issuer");
         mapLang.put("发放人2","Issuer 2");