Merge remote-tracking branch 'origin/dev-1.2' into dev-1.2

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0083.java

@@ -24,7 +24,7 @@ public class FIRC0083 extends QCCatalogue {
         }
         double likeRate = firstCourseRecordDoc.getCaseCharacteristicLabel().getLikeRate();
         // 根据医学部要求将相似度阈值提高到85%
-        if (likeRate > 0.85) {
+        if (likeRate > 0.95) {
             status.set("-1");
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC0093.java

@@ -11,7 +11,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.text.ParseException;
-import java.util.Calendar;
 import java.util.Date;
 import java.util.Map;
 
@@ -36,7 +35,9 @@ public class FIRC0093 extends QCCatalogue {
                 if (StringUtils.isNotEmpty(couDate) && StringUtils.isNotEmpty(beDate)) {
                     Date date_in = StringUtil.parseDateTime(beDate);
                     Date date_out = StringUtil.parseDateTime(couDate);
-                    if (date_in == null || date_out == null) return;
+                    if (date_in == null || date_out == null) {
+                        return;
+                    }
                     boolean firc = CatalogueUtil.compareTime(date_in, date_out, 8 * 60L);
                     if (firc) {
                         status.set("-1");
@@ -44,16 +45,20 @@ public class FIRC0093 extends QCCatalogue {
                 }
             }
         } else {
-            Map<String, String> beHospitalizedDocStructureMap = beHospitalizedDoc.getStructureMap();
-            if (beHospitalizedDocStructureMap != null) {
-                String beDate = beHospitalizedDocStructureMap.get("入院日期");
-                if (StringUtils.isNotEmpty(beDate)) {
-                    Date date_in = StringUtil.parseDateTime(beDate);
-                    Date date_out = new Date();
-                    if (date_in == null) return;
-                    boolean firc = CatalogueUtil.compareTime(date_in, date_out, 8 * 60L);
-                    if (firc) {
-                        status.set("-1");
+            if (beHospitalizedDoc != null) {
+                Map<String, String> beHospitalizedDocStructureMap = beHospitalizedDoc.getStructureMap();
+                if (beHospitalizedDocStructureMap != null) {
+                    String beDate = beHospitalizedDocStructureMap.get("入院日期");
+                    if (StringUtils.isNotEmpty(beDate)) {
+                        Date date_in = StringUtil.parseDateTime(beDate);
+                        Date date_out = new Date();
+                        if (date_in == null) {
+                            return;
+                        }
+                        boolean firc = CatalogueUtil.compareTime(date_in, date_out, 8 * 60L);
+                        if (firc) {
+                            status.set("-1");
+                        }
                     }
                 }
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0128.java

@@ -93,7 +93,7 @@ public class THR0128 extends QCCatalogue {
                 if (indicationsNum < 3) {
                     //每周无3次主治医师查房记录
                     status.set("-1");
-                    info.set(lastWardDateRange);
+                    info.set(lastWardDateRangeList.get(j));
                     return;
                 }
             }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxConsultationDocTrans.java

@@ -230,6 +230,7 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
             "新会诊-会诊分类=会诊分类",
             "新会诊-会诊时间=会诊时间",
             "新会诊-会诊地点=会诊地点",
+            "新会诊-接待医生=受邀医生",
             "签名++++=签名"
     );
 

trans/src/main/java/com/lantone/qc/trans/changx/ChangxOperationDocTrans.java

@@ -235,7 +235,8 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
             "失血量=",
             "手术经过=",
             "记录时间=",
-            "风险评估分值=手术风险评估"
+            "记录时间=",
+            "术（中）后诊断++++术后中诊断=术后诊断"
     );