邵逸夫bug修改

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH02909.java

@@ -15,6 +15,8 @@ import java.util.List;
 /**
  * @ClassName : BEH02909
  * @Description : 目前使用药物情况与现病史描述不一致
+ * 两者都不为空
+ *现病史中出现的药去目前使用药物情况找，如果找不到就报
  * @Author : 胡敬
  * @Date: 2020-06-11 16:10
  */
@@ -27,16 +29,12 @@ public class BEH02909 extends QCCatalogue {
             status.set("0");
             return;
         }
-        String drugsCurrentlyInUse = inputInfo.getBeHospitalizedDoc().getStructureMap().get("目前使用的药物");
+        String drugsCurrentlyInUse = inputInfo.getBeHospitalizedDoc().getStructureMap().get("长期用药");
         if (StringUtil.isBlank(drugsCurrentlyInUse)) {
             status.set("0");
             return;
         }
-        /*if (drugsCurrentlyInUse.contains("见现病史")) {
-            status.set("0");
-            return;
-        }*/
-        /*List<String> drug = getDrug(drugsCurrentlyInUse);*/
+
         PresentLabel presentLabel = inputInfo.getBeHospitalizedDoc().getPresentLabel();
         if (presentLabel == null) {
             status.set("0");

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

@@ -35,7 +35,7 @@ public class FIRC0092 extends QCCatalogue {
         }
 
         Map<String,String> structureMap = firstCourseRecordDoc.getStructureMap();
-        String structureV= structureMap.get("治疗监测计划");
+        String structureV= structureMap.get("治疗计划");
         if(StringUtil.isNotBlank(structureV) && structureV.contains("护理")){
             findText = true;
         }
@@ -43,6 +43,7 @@ public class FIRC0092 extends QCCatalogue {
                 (treatPlanLabel.getMedicine() != null || treatPlanLabel.getTreat().size() > 0
                         || treatPlanLabel.getPacs().size() > 0)) {
             status.set("0");
+            return;
         }
         if (treatPlanLabel.getNursingLevel() == null) {
             info.set("无护理级别");

trans/src/main/java/com/lantone/qc/trans/shaoyf/ShaoyfOperationDocTrans.java

@@ -203,9 +203,8 @@ public class ShaoyfOperationDocTrans extends ModelDocTrans {
             "参加人员及职称=参加人员",
             "主刀医师=主刀医师签名",
             "术前准备=术前准备内容",
-            "注意事项=术前术后注意事项",
+            "注意事项=可能意外和防范措施",
             "辅助检查结果=辅助检查",
-            "术中、术后防范措施=可能意外和防范措施",
             "现病史- 发病情况=发病经过",
             "本人姓名=姓名",
             "手术名称=拟行术式",