rengb 5 anni fa
parent
commit
9ee455fe5a

+ 1 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0050.java

@@ -20,6 +20,7 @@ public class BEH0050 extends QCCatalogue {
         Smoking smoking = inputInfo.getBeHospitalizedDoc().getPersonalLabel().getSmoking();
         if (smoking == null
                 || StringUtil.isBlank(smoking.getName())
+                || (smoking.getNegative() != null && StringUtil.isNotBlank(smoking.getNegative().getName()))
                 || (smoking.getPd() != null && StringUtil.isNotBlank(smoking.getPd().getName()))
                 || (smoking.getUsage() != null && StringUtil.isNotBlank(smoking.getUsage().getName()))) {
             status = "0";

+ 1 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0051.java

@@ -20,6 +20,7 @@ public class BEH0051 extends QCCatalogue {
         Drinking drinking = inputInfo.getBeHospitalizedDoc().getPersonalLabel().getDrinking();
         if (drinking == null
                 || StringUtil.isBlank(drinking.getName())
+                || (drinking.getNegative() != null && StringUtil.isNotBlank(drinking.getNegative().getName()))
                 || (drinking.getPd() != null && StringUtil.isNotBlank(drinking.getPd().getName()))
                 || (drinking.getUsage() != null && StringUtil.isNotBlank(drinking.getUsage().getName()))) {
             status = "0";

+ 1 - 0
public/src/main/java/com/lantone/qc/pub/model/entity/Drinking.java

@@ -12,6 +12,7 @@ import lombok.Setter;
 @Setter
 @Getter
 public class Drinking extends General {
+    private Negative negative;
     private PD pd;  //时间
     private Usage usage;   //用量
 }

+ 1 - 0
public/src/main/java/com/lantone/qc/pub/model/entity/Smoking.java

@@ -12,6 +12,7 @@ import lombok.Setter;
 @Setter
 @Getter
 public class Smoking extends General {
+    private Negative negative;
     private PD pd;  //时间
     private Usage usage;   //用量
 }