输血记录模块规则更新

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0562.java

@@ -24,8 +24,8 @@ public class CLI0562 extends QCCatalogue {
         if(clinicalBloodDocs != null && clinicalBloodDocs.size()>0){
             for (ClinicalBloodDoc cliB:clinicalBloodDocs) {
                 Map<String, String> cliBStructureMap = cliB.getStructureMap();
-                if(cliBStructureMap.containsKey("开始输血时间")){
-                    if(StringUtils.isEmpty(cliBStructureMap.get("开始输血时间"))){
+                if(cliBStructureMap.containsKey("输注开始")){
+                    if(StringUtils.isEmpty(cliBStructureMap.get("输注开始"))){
                         status.set("-1");
                         break;
                     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0563.java

@@ -28,10 +28,10 @@ public class CLI0563 extends QCCatalogue {
         if(clinicalBloodDocs != null && clinicalBloodDocs.size()>0){
             for (ClinicalBloodDoc cliB:clinicalBloodDocs) {
                 Map<String, String> cliBStructureMap = cliB.getStructureMap();
-                if(cliBStructureMap.containsKey("开始输血时间")){
-                    if(!StringUtils.isEmpty(cliBStructureMap.get("开始输血时间"))){
+                if(cliBStructureMap.containsKey("输注开始")){
+                    if(!StringUtils.isEmpty(cliBStructureMap.get("输注开始"))){
                         try {
-                            Date date_in = new SimpleDateFormat(FORMAT_LONC_CN_MI).parse(cliBStructureMap.get("开始输血时间"));
+                            Date date_in = new SimpleDateFormat(FORMAT_LONC_CN_MI).parse(cliBStructureMap.get("输注开始"));
                         } catch (ParseException e) {
                             status.set("-1");
                             break;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0564.java

@@ -24,8 +24,8 @@ public class CLI0564 extends QCCatalogue {
         if(clinicalBloodDocs != null && clinicalBloodDocs.size()>0){
             for (ClinicalBloodDoc cliB:clinicalBloodDocs) {
                 Map<String, String> cliBStructureMap = cliB.getStructureMap();
-                if(cliBStructureMap.containsKey("输血结束时间")){
-                    if(StringUtils.isEmpty(cliBStructureMap.get("输血结束时间"))){
+                if(cliBStructureMap.containsKey("输注结束")){
+                    if(StringUtils.isEmpty(cliBStructureMap.get("输注结束"))){
                         status.set("-1");
                         break;
                     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0565.java

@@ -28,10 +28,10 @@ public class CLI0565 extends QCCatalogue {
         if(clinicalBloodDocs != null && clinicalBloodDocs.size()>0){
             for (ClinicalBloodDoc cliB:clinicalBloodDocs) {
                 Map<String, String> cliBStructureMap = cliB.getStructureMap();
-                if(cliBStructureMap.containsKey("输血结束时间")){
-                    if(!StringUtils.isEmpty(cliBStructureMap.get("输血结束时间"))){
+                if(cliBStructureMap.containsKey("输注结束")){
+                    if(!StringUtils.isEmpty(cliBStructureMap.get("输注结束"))){
                         try {
-                            Date date_in = new SimpleDateFormat(FORMAT_LONC_CN_MI).parse(cliBStructureMap.get("输血结束时间"));
+                            Date date_in = new SimpleDateFormat(FORMAT_LONC_CN_MI).parse(cliBStructureMap.get("输注结束"));
                         } catch (ParseException e) {
                             status.set("-1");
                             break;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0566.java

@@ -24,8 +24,8 @@ public class CLI0566 extends QCCatalogue {
         if(clinicalBloodDocs != null && clinicalBloodDocs.size()>0){
             for (ClinicalBloodDoc cliB:clinicalBloodDocs) {
                 Map<String, String> cliBStructureMap = cliB.getStructureMap();
-                if(cliBStructureMap.containsKey("记录者")){
-                    if(StringUtils.isEmpty(cliBStructureMap.get("记录者"))){
+                if(cliBStructureMap.containsKey("记录医师")){
+                    if(StringUtils.isEmpty(cliBStructureMap.get("记录医师"))){
                         status.set("-1");
                         break;
                     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0569.java

@@ -24,8 +24,8 @@ public class CLI0569 extends QCCatalogue {
         if(clinicalBloodDocs != null && clinicalBloodDocs.size()>0){
             for (ClinicalBloodDoc cliB:clinicalBloodDocs) {
                 Map<String, String> cliBStructureMap = cliB.getStructureMap();
-                if(cliBStructureMap.containsKey("血型")){
-                    if(StringUtils.isEmpty(cliBStructureMap.get("血型"))){
+                if(cliBStructureMap.containsKey("输注种类、血型、数量")){
+                    if(StringUtils.isEmpty(cliBStructureMap.get("输注种类、血型、数量"))){
                         status.set("-1");
                         break;
                     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/clinicalblood/CLI0571.java

@@ -24,8 +24,8 @@ public class CLI0571 extends QCCatalogue {
         if(clinicalBloodDocs != null && clinicalBloodDocs.size()>0){
             for (ClinicalBloodDoc cliB:clinicalBloodDocs) {
                 Map<String, String> cliBStructureMap = cliB.getStructureMap();
-                if(cliBStructureMap.containsKey("RH血型")){
-                    if(StringUtils.isEmpty(cliBStructureMap.get("RH血型"))){
+                if(cliBStructureMap.containsKey("输注种类、血型、数量")){
+                    if(!cliBStructureMap.get("输注种类、血型、数量").contains("Rh")){
                         status.set("-1");
                         break;
                     }

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

@@ -102,7 +102,8 @@ public class ChangxConsultationDocTrans extends ModelDocTrans {
 
     private List<String> consultationRecord_keyContrasts = Lists.newArrayList(
             "执行情况=会诊情况",
-            "记录日期=记录时间"
+            "记录日期=记录时间",
+            "签名++++=签名"
     );