优化检查打印

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/JianYanJianChaDao.java

@@ -332,7 +332,8 @@ public interface JianYanJianChaDao {
             "(#{item.reqNo}, #{inpatientNo}, #{name}, #{age}, #{admissTimes}, #{bedNo}, #{item.orderName}, " +
             "        #{item.actOrderNo}, #{item.orderCode}, #{item.orderName}, #{item.reqNo}, #{item.reqComment}, #{userCode}, " +
             "        #{deptCode}, #{wardCode}, #{item.execDept}, getdate(), '1', #{reqType}, getdate(), #{item.startTime},#{item.diagCode},#{item.diagText}, " +
-            "        (select order_type from yz_order_item where order_code = #{item.orderCode}),#{item.jzFlag},#{item.reqTzComment},#{item.reqOtherResult}," +
+            "        (select class from ${orderTypeTable} where zy_order_code = #{item.orderCode})," +
+            "       #{item.jzFlag},#{item.reqTzComment},#{item.reqOtherResult}," +
             "       #{item.inspectStuff})" +
             "</foreach>" +
             "</script>")
@@ -345,7 +346,8 @@ public interface JianYanJianChaDao {
                        @Param("userCode") String userCode,
                        @Param("deptCode") String deptCode,
                        @Param("wardCode") String wardCode,
-                       @Param("reqType") String reqType);
+                       @Param("reqType") String reqType,
+                       @Param("orderTypeTable") String orderTypeTable);
 
     @Insert("<script>" +
             "INSERT INTO yz_act_order (order_code, order_name, frequ_code, infant_flag/*婴儿标志*/, order_time, physician, start_time, " +

src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/jianyanjiancha/TianJiaJianChaJianYan.java

@@ -67,9 +67,6 @@ public class TianJiaJianChaJianYan {
     @NotBlank(message = "申请类型不能为空")
     private String reqType;
 
-
-
-
     /**
      * 上传的数据
      */

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/JianYanJianChaShenQingServer.java

@@ -109,7 +109,7 @@ public class JianYanJianChaShenQingServer {
         // 医保身份
         req.setResponceTypeName(dao.huoQuHuanZheShenFen(req.getInpatientNo()));
 
-        map.put("biaoTi", jc.getComm());
+        map.put("title", jc.getComm());
         Field[] fields = jc.getClass().getDeclaredFields();
         for (Field field : fields) {
             field.setAccessible(true);
@@ -124,8 +124,8 @@ public class JianYanJianChaShenQingServer {
                 e.printStackTrace();
             }
         }
-        map.put("zhuYiShiXiang", zhuYiShiXiang.toString());
-        map.put("shuJu", req);
+        map.put("mattersNeedingAttention", zhuYiShiXiang.toString());
+        map.put("data", req);
         return ResultVoUtil.success(map);
     }
 
@@ -471,7 +471,8 @@ public class JianYanJianChaShenQingServer {
     @Transactional(rollbackFor = Exception.class)
     public void insertData(TianJiaJianChaJianYan param, XinZhenYiZhu huanZheXinXi, String userCode) {
         dao.chaRuShenQing(param.getList(), param.getInpatientNo(), param.getName(), param.getAge() + "岁", param.getAdmissTimes(),
-                param.getBedNo(), userCode, huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), param.getReqType());
+                param.getBedNo(), userCode, huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), param.getReqType(),
+                "3".equals(param.getReqType()) ? "jc_zd_item" : "jy_zd_item");
         dao.chaRuShenQingYiZhu(param.getList(), param.getInpatientNo(), param.getAdmissTimes(), userCode, huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(),
                 PublicServer.getInfantFlag(param.getInpatientNo()));
         for (YshYjReq item : param.getList()) {
@@ -553,9 +554,11 @@ public class JianYanJianChaShenQingServer {
             return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "没有查询到检查结果。");
         }
         Map<String, String> textJc = dao.selectTextJc(yjJcRecord.getReportNo());
+        if (textJc != null) {
+            yjJcRecord.setDiagnosticOpinion(textJc.get("text_zd"));
+            yjJcRecord.setCheckWhatYouSee(textJc.get("text_jc"));
+        }
 
-        yjJcRecord.setDiagnosticOpinion(textJc.get("text_zd"));
-        yjJcRecord.setCheckWhatYouSee(textJc.get("text_jc"));
         Map<String, Object> map = new HashMap<>(Capacity.TWO);
         map.put("record", yjJcRecord);
         return ResultVoUtil.success(map);
@@ -631,10 +634,12 @@ public class JianYanJianChaShenQingServer {
     }
 
 
+    @DS("his")
     public ResultVo<List<JyJcItem>> getJcItem(String code) {
         return ResultVoUtil.success(dao.getJcItem(StringUtil.isContainChinese(code)));
     }
 
+    @DS("his")
     public ResultVo<List<JyJcItem>> getJyItem(String code) {
         return ResultVoUtil.success(dao.getJyItem(StringUtil.isContainChinese(code)));
     }