校验

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

@@ -562,7 +562,7 @@ public interface JianYanJianChaDao {
     JSONObject getExamineIllustrate(String orderCode, String tableName);
 
 
-    @Select("select a.order_code                  as code," +
+    @Select("select a.order_code                  as code,\n" +
             "       c.name                        as name,\n" +
             "       cast(rtrim(isnull(nullif(c.del_flag,\n" +
             "                                ''),\n" +
@@ -573,13 +573,10 @@ public interface JianYanJianChaDao {
             "       e.gender_restriction,\n" +
             "       e.max_age_restriction,\n" +
             "       e.min_age_restriction\n" +
-            "from yz_order_item a with (NOLOCK),\n" +
-            "     yz_order_occurence b with (NOLOCK),\n" +
-            "     zd_charge_item c with (NOLOCK),\n" +
-            "     ${tableName} e with (NOLOCK)\n" +
-            "where a.order_code = e.zy_order_code\n" +
-            "  and a.order_code = b.order_code\n" +
-            "  and b.occ_code = c.code\n" +
+            "from yz_order_item a with (NOLOCK)\n" +
+            "         left join yz_order_occurence b with (NOLOCK) on (a.order_code = b.order_code)\n" +
+            "         left join zd_charge_item c with (NOLOCK) on (c.code = b.occ_code)\n" +
+            "         left join ${tableName} e with (NOLOCK) on (a.order_code = e.zy_order_code) " +
             " and  ${ew.sqlSegment};")
-    List<JyJcCheckItemDto> selectJyJcCheckItemDto(@Param("ew") QueryWrapper<?> queryWrapper, String tableName);
+    List<JyJcCheckItemDto> selectJyJcCheckItemDto(@Param("ew") QueryWrapper<?> queryWrapper, @Param("tableName") String tableName);
 }

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

@@ -433,7 +433,6 @@ public class JianYanJianChaShenQingService {
         Map<String, List<JyJcCheckItemDto>> jc = getItemInfo(jcCodes, true);
         Map<String, List<JyJcCheckItemDto>> jy = getItemInfo(jyCodes, false);
 
-
         for (int i = 0; i < param.getList().size(); i++) {
             int finalI = i + 1;
             YshYjReq item = param.getList().get(i);
@@ -452,25 +451,25 @@ public class JianYanJianChaShenQingService {
 
             JyJcCheckItemDto one = itemInfo.get(0);
 
-            if (one.getGenderRestriction() != null && !one.getGenderRestriction().equals(huanZheXinXi.getSex())) {
-                cuoWuXinXi.append(baoCunCuoWuXinXi(finalI, "患者的性别不能开这个项目。"));
-            }
-
             Integer age = huanZheXinXi.patientAge();
 
-            if (one.getMaxAgeRestriction() != null && one.getMaxAgeRestriction() <= age) {
-                cuoWuXinXi.append(baoCunCuoWuXinXi(finalI, "项目最大年龄限制" + one.getMaxAgeRestriction() + "岁，患者年龄不符合。"));
-            }
-
-            if (one.getMinAgeRestriction() != null && one.getMinAgeRestriction() >= age) {
-                cuoWuXinXi.append(baoCunCuoWuXinXi(finalI, "项目最小年龄限制" + one.getMinAgeRestriction() + "岁，患者年龄不符合。"));
-            }
-
             if (one.getOrderDelFlag()) {
                 cuoWuXinXi.append(baoCunCuoWuXinXi(finalI, "医嘱已停用"));
             }
 
             itemInfo.forEach(value -> {
+                if (value.getGenderRestriction() != null && !value.getGenderRestriction().equals(huanZheXinXi.getSex())) {
+                    cuoWuXinXi.append(baoCunCuoWuXinXi(finalI, "患者的性别不能开这个项目。"));
+                }
+
+                if (value.getMaxAgeRestriction() != null && value.getMaxAgeRestriction() <= age) {
+                    cuoWuXinXi.append(baoCunCuoWuXinXi(finalI, "项目最大年龄限制" + one.getMaxAgeRestriction() + "岁，患者年龄不符合。"));
+                }
+
+                if (value.getMinAgeRestriction() != null && value.getMinAgeRestriction() >= age) {
+                    cuoWuXinXi.append(baoCunCuoWuXinXi(finalI, "项目最小年龄限制" + one.getMinAgeRestriction() + "岁，患者年龄不符合。"));
+                }
+
                 if (value.getItemDelFlag()) {
                     cuoWuXinXi.append(baoCunCuoWuXinXi(finalI, "项目已停用：【" + value.getName() + "】"));
                 }