Browse Source

温附一:手术记录模板增加

wangsy 3 years ago
parent
commit
46512e8148

+ 1 - 1
dbanaly/src/main/java/com/lantone/qc/dbanaly/facade/comsis/ModuleHelper.java

@@ -53,7 +53,7 @@ public class ModuleHelper {
     public boolean loadModuleInfo() {
         try {
             List<String> xmlDataTypeHospitalIds = Lists.newArrayList("1", "2", "3");
-            List<String> htmlDataTypeHospitalIds = Lists.newArrayList("4", "5");
+            List<String> htmlDataTypeHospitalIds = Lists.newArrayList("4", "5", "10", "13");
             for (String hospitalId : hospitalIds.split(",")) {
                 loadStandardModule(hospitalId);
                 if (xmlDataTypeHospitalIds.contains(hospitalId)) {

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC03087.java

@@ -29,7 +29,7 @@ public class FIRC03087 extends QCCatalogue {
             return;
         }
         String text = treatPlanLabel.getText();
-        if (StringUtil.isBlank(text) || text.contains("检查") || text.contains("三大常规") || text.contains("CT")) {
+        if (StringUtil.isBlank(text) || text.contains("检查") || text.contains("检验") || text.contains("三大常规") || text.contains("CT")) {
             status.set("0");
             return;
         }

+ 1 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0134.java

@@ -64,8 +64,7 @@ public class THR0134 extends QCCatalogue {
                     if (StringUtil.isBlank(opeEndDate)) {
                         opeEndDate = structureMap.get("记录时间");
                     }
-                    String regex = ".*\\d.*";
-                    if (!opeEndDate.matches(regex)) {
+                    if (StringUtil.isBlank(opeEndDate) || StringUtil.parseDateTime(opeEndDate) == null) {
                         continue;
                     }
                     if (StringUtil.isNotBlank(opeEndDate) &&

+ 1 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0139.java

@@ -65,8 +65,7 @@ public class THR0139 extends QCCatalogue {
                     if (StringUtil.isBlank(opeEndDate)) {
                         opeEndDate = structureMap.get("记录时间");
                     }
-                    String regex = ".*\\d.*";
-                    if (!opeEndDate.matches(regex)) {
+                    if (StringUtil.isBlank(opeEndDate) || StringUtil.parseDateTime(opeEndDate) == null) {
                         continue;
                     }
                     if (StringUtil.isNotBlank(opeEndDate) &&