住院医生优化

src/main/java/thyyxxk/webserver/dao/his/api/forpowersi/drgdip/DrgDipDao.java

@@ -462,8 +462,9 @@ public interface DrgDipDao {
             "adm_caty,refldept_dept,resp_nurs_code, " +
             "dscgTime=convert(varchar(19),dscg_time,21), " +
             "dscg_caty,act_ipt_days,otp_wm_dise,wm_dise_code,otp_tcm_dise,tcm_dise_code, " +
-            "vent_used_dura,pwcry_afadm_coma_dura,pwcry_bfadm_coma_dura,spga_nurscare_days, " +
-            "lv1_nurscare_days,scd_nurscare_days,lv3_nurscare_days,dscg_way, " +
+            "vent_used_dura,pwcry_afadm_coma_dura,pwcry_bfadm_coma_dura,isnull(spga_nurscare_days,0) as spga_nurscare_days, " +
+            "isnull(lv1_nurscare_days,0) as lv1_nurscare_days,isnull(scd_nurscare_days,0) as scd_nurscare_days," +
+            "isnull(lv3_nurscare_days,0) as lv3_nurscare_days,dscg_way, " +
             "acp_medins_name,acp_optins_code,bill_code,bill_no,biz_sn, " +
             "days_rinp_flag31 as days_rinp_flag_31,days_rinp_pup31 as days_rinp_pup_31, " +
             "chfpdr_name,chfpdr_code, " +

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

@@ -550,7 +550,6 @@ public interface JianYanJianChaDao {
             "  and isnull(zy_flag, '0') = '0' " +
             "  and a.zy_order_code = b.order_code " +
             "  and inspect_stuff is not null " +
-            "  and nullif(exec_unit, '') is not null " +
             "  and (zy_order_code like #{code} or py_code like #{code} or d_code like #{code} or name like #{code})")
     List<JyJcItem> getJyItem(String code);
 

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

@@ -1544,7 +1544,8 @@ public interface YiZhuLuRuDao {
             "values " +
             "<foreach collection='list' item='item' separator=','>" +
             "(#{patInfo.inpatientNo},#{patInfo.admissTimes},#{patInfo.name},#{patInfo.bedNo},#{patInfo.deptCode},#{patInfo.wardCode},#{item.orderCode}," +
-            "#{item.drugQuan},(select pack_retprice from yp_zd_dict where code = '${item.orderCode}' and serial = '${item.serial}'),getdate(),#{patInfo.infantFlag},#{userCode}," +
+            "#{item.drugQuan},(select pack_retprice from yp_zd_dict where code = '${item.orderCode}' and serial = '${item.serial}'),getdate()," +
+            "#{patInfo.infantFlag},#{userCode}," +
             "'a','1',#{item.drugFlag},'0',getdate(),#{item.actOrderNo},#{pageNo},'0',#{item.serial},#{groupNo},#{userCode},'1')" +
             "</foreach>" +
             "</script>")

src/main/java/thyyxxk/webserver/service/dictionary/EmrDataMaintenanceServer.java

@@ -194,8 +194,14 @@ public class EmrDataMaintenanceServer {
 
     public ResultVo<String> insertExtractDataSource(EmrDataExtract param) {
         log.info("插入的数据：{}", JSON.toJSONString(param));
-        dao.insertExtractDataSource(param);
-        return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
+        try {
+            dao.insertExtractDataSource(param);
+            return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_NOTIFICATION);
+        } catch (Exception e) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "编码不能重复。");
+        }
+
+
     }
 
 

src/main/java/thyyxxk/webserver/service/heliyongyao/RationalUseServer.java

@@ -84,7 +84,7 @@ public class RationalUseServer {
             log.info("上传数据：{}", js);
             JSONObject json = http.rationalUse(js);
             log.info("返回的数据:{}", json);
-            if (json.getInteger("result_lv") > 0) {
+            if (json.getInteger("result_lv") > 2) {
                 JSONArray data = json.getJSONObject("result_xml").getJSONObject("ui_results_xml").getJSONObject("result_data").getJSONArray("result");
                 for (int i = 0; i < data.size(); i++) {
                     JSONObject item = data.getJSONObject(i);

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

@@ -397,6 +397,7 @@ public class JianYanJianChaShenQingServer {
         int index = 1;
         List<String> content = new ArrayList<>();
         StringBuilder cuoWuXinXi = new StringBuilder();
+
         for (YshYjReq item : param.getList()) {
             if (StringUtil.notBlank(item.getJzFlag()) && item.getJzFlag().equals("0")) {
                 item.setJzFlag(null);
@@ -436,12 +437,8 @@ public class JianYanJianChaShenQingServer {
                     cuoWuXinXi.append(baoCunCuoWuXinXi(index, "标本不能为空。"));
                 }
             }
-
             if (cuoWuXinXi.length() > 0) {
                 cuoWuXinXi.append("<br>");
-            } else {
-                item.setActOrderNo(BigDecimal.valueOf(publicServer.getActOrderNo()));
-                item.setReqNo(publicServer.getReqPageNo());
             }
             xm.add(item.getOrderCode().trim());
             content.add(String.format("%s：<span style='color:#409eff'>【%s】</span><br>" +
@@ -450,14 +447,20 @@ public class JianYanJianChaShenQingServer {
                     item.getOrderName(), huanZheXinXi.getName(), huanZheXinXi.getBedNo()));
             index++;
         }
+        // 先判断是不是停用了
         String tingYong = publicServer.xiangMuXianZhi(xm, true);
         if (StringUtil.notBlank(tingYong)) {
             throw new BizException(ExceptionEnum.LOGICAL_HTML_ERROR, tingYong);
         }
-
         if (StringUtil.notBlank(cuoWuXinXi.toString())) {
             throw new BizException(ExceptionEnum.LOGICAL_HTML_ERROR, String.valueOf(cuoWuXinXi));
         }
+        // 生成 医嘱号和申请号
+        for (YshYjReq item : param.getList()) {
+            item.setActOrderNo(BigDecimal.valueOf(publicServer.getActOrderNo()));
+            item.setReqNo(publicServer.getReqPageNo());
+        }
+
         String userCode = TokenUtil.getTokenUserId();
         dao.chaRuShenQing(param.getList(), param.getInpatientNo(), param.getName(), param.getAge() + "岁", param.getAdmissTimes(),
                 param.getBedNo(), userCode, huanZheXinXi.getDeptCode(), huanZheXinXi.getDeptCode(), param.getReqType());
@@ -619,6 +622,5 @@ public class JianYanJianChaShenQingServer {
     }
 
 
-
 }
 

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

@@ -1015,12 +1015,12 @@ public class YiZhuLuRuServer {
                         }
                     }
                 }
-                if (item.getSelfBuy() != null && item.getSelfBuy().equals("4")) {
+                if (item.getSelfBuy() != null && "4".equals(item.getSelfBuy())) {
                     // 如果是临时医嘱 开了就结束了.
                     if ("ONCE".equals(item.getFrequCode())) {
                         item.setEndTime(item.getStartTime());
                     }
-                    if (dao.dischargeWithMedicationAdministration(item.getFrequCode()) == 0) {
+                    if (dao.dischargeWithMedicationAdministration(item.getSupplyCode()) == 0) {
                         错误信息.add("出院带药给药方式不能包含费用。");
                     }