fix:[模板管理]优化

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/Template.java

@@ -58,6 +58,12 @@ public class Template extends MpBaseEntity
     /** 是否需要病理学家审核：1：否；10：是 */
     private Integer showBlxjsh;
 
+    /** 显示打印：1否；10是 */
+    private Integer showDy;
+
+    /** 打印模板 */
+    private String dymb;
+
     /** 仅提交：1否；10是 */
     private Integer onlySubmit;
 
@@ -80,6 +86,22 @@ public class Template extends MpBaseEntity
     @TableField(exist = false)
     private String deptName;
 
+    public Integer getShowDy() {
+        return showDy;
+    }
+
+    public void setShowDy(Integer showDy) {
+        this.showDy = showDy;
+    }
+
+    public String getDymb() {
+        return dymb;
+    }
+
+    public void setDymb(String dymb) {
+        this.dymb = dymb;
+    }
+
     public Integer getOnlySubmit() {
         return onlySubmit;
     }

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

@@ -1408,11 +1408,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
     @Override
     public void cc(CcForm form) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
-        SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id());
+        SysUser qmr2 = null;
+        if(form.getQmr2Id()!=null){
+            qmr2= sysUserService.selectUserById(form.getQmr2Id());
+        }
         //验证签名人1密码
         checkPassword(qmr, form.getQmr1mm(), true,"签名人1");
         //验证签名人2密码
-        checkPassword(qmr2, form.getQmr2mm(), true,"签名人2");
+        if(qmr2!=null){
+            checkPassword(qmr2, form.getQmr2mm(), true,"签名人2");
+        }
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -1420,9 +1425,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         if (gyzjOld == null) {
             throw new ServiceException("给药制剂不存在或已删除");
         }
-        if (!gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue())) {
-            throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是已发放状态，不能解锁");
-        }
         gyzjOld.setCcwz(form.getCcwz());
         gyzjOld.setCctj(form.getCctj());
         gyzjOld.setCczt(CcztEnum.Cc.getValue());
@@ -1448,11 +1450,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
     @Override
     public void qc(CcForm form) {
         SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
-        SysUser qmr2 = sysUserService.selectUserById(form.getQmr2Id());
+        SysUser qmr2 = null;
+        if(form.getQmr2Id()!=null){
+            qmr2= sysUserService.selectUserById(form.getQmr2Id());
+        }
         //验证签名人1密码
         checkPassword(qmr, form.getQmr1mm(), true,"签名人1");
         //验证签名人2密码
-        checkPassword(qmr2, form.getQmr2mm(), true,"签名人2");
+        if(qmr2!=null){
+            checkPassword(qmr2, form.getQmr2mm(), true,"签名人2");
+        }
         if (form.getId() == null || form.getId().longValue() < 0) {
             throw new ServiceException("参数id不正确");
         }
@@ -1460,9 +1467,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         if (gyzjOld == null) {
             throw new ServiceException("给药制剂不存在或已删除");
         }
-        if (!gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue())) {
-            throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是已发放状态，不能解锁");
-        }
         gyzjOld.setCczt(CcztEnum.Qc.getValue());
         this.updateById(gyzjOld);
         //稽查轨迹

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

@@ -1090,6 +1090,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         if (StringUtils.isNoneBlank(form.getSubmittedCodes())) {
             baseMapper.updateSubmittedCodes(form.getId(), form.getSubmittedCodes());
         }
+        Date now = new Date();
         //稽查轨迹
         if (StringUtils.isNoneBlank(form.getFiledValue()) && !"null".equals(form.getFiledValue())) {
             StudyFormFill studyFormFillOld = this.getById(form.getId());
@@ -1113,6 +1114,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl
                         formDataEn.put("原值", jsonObject.getString("oldValue"));
                         formDataEn.put("新值", jsonObject.getString("value"));
                         formDataEn.put("原因", jsonObject.getString("reason"));
+                        //签名信息
+                        studyFormFillQmxxService.saveQmxx(now, studyFormFillOld.getId(), "修改记录", qmr, jsonObject.getString("reason"));
                         studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(jsonObject.getDate("time"), studyFormFillOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
                     } else {
                         //zh
@@ -1127,7 +1130,6 @@ public class StudyFormFillServiceImpl extends ServiceImpl
                         formDataEn.put("填写人", qmr.getNickName());
                         studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(jsonObject.getDate("time"), studyFormFillOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
                     }
-
                 }
             }
             studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjs);