在现病史中症状主诉未填写、身份证信息错误

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0162.java

@@ -25,6 +25,10 @@ public class FIRP0162 extends QCCatalogue {
         status.set("0");
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
+            String nationality = firstpageStructureMap.get(Content.nationality);
+            if(StringUtil.isNotBlank(nationality) && !"中国".equals(nationality)){
+                return;
+            }
             String idNumber = firstpageStructureMap.get(Content.idNumber);
             if (StringUtil.isNotBlank(idNumber)) {
                 for (String word : containList) {

trans/src/main/java/com/lantone/qc/trans/changshaxy/BeHospitalizedDocTrans.java

@@ -45,6 +45,12 @@ public class BeHospitalizedDocTrans extends ModelDocTrans {
                 Map<String, String> sourceMap = htmlAnalysis.analysis(content, recTitle, recTypeId);
                 if (MapUtils.isNotEmpty(sourceMap)) {
                     structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
+                    if(StringUtils.isNotEmpty(structureMap.get("入院方式"))  && StringUtils.isBlank(structureMap.get("主诉"))
+                            && structureMap.get("入院方式").contains("主诉")){
+                        String[] split = structureMap.get("入院方式").split("主诉");
+                        structureMap.put("入院方式",split[0]);
+                        structureMap.put("主诉",split[1]);
+                    }
                     if (StringUtils.isNotEmpty(structureMap.get("记录时间"))) {
                         String date = structureMap.get("记录时间");
                         structureMap.put("记录时间", date.replace("，", " "));