增加逻辑判断

src/main/java/com/diagbot/dto/MedManageParamsDTO.java

@@ -36,6 +36,9 @@ public class MedManageParamsDTO implements Serializable {
     //化验报告名称
     private String repName;
 
+    //医嘱状态判别
+    private String da_status;
+
     /**
      * 住院科室名称
      */

src/main/java/com/diagbot/facade/ConsoleFacade.java

@@ -2601,9 +2601,11 @@ public class ConsoleFacade {
         List<MedManageParamsDTO> manageList= new ArrayList<>();
         for (int i = 0; i < medManageParams.size(); i++) {
             List<String> rescueDrugList = QualityContent.getRescue_Drug_List();
+            String doctorAdviceType = medManageParams.get(i).getDoctorAdviceType();
+            String da_status = medManageParams.get(i).getDa_status();
             for (String str : rescueDrugList) {
                 String daItemName = medManageParams.get(i).getDaItemName();
-                if(StringUtils.isNotEmpty(daItemName) && daItemName.contains(str)){
+                if(StringUtils.isNotEmpty(daItemName) && daItemName.contains(str) && StringUtils.isNotEmpty(doctorAdviceType) && doctorAdviceType.equals(QualityContent.STAT_ORDER) && StringUtils.isNotEmpty(da_status) && ! doctorAdviceType.equals(QualityContent.CANCELLATION_ORDER)){
                     manageList.add(medManageParams.get(i));
                 }
             }
@@ -2659,10 +2661,12 @@ public class ConsoleFacade {
         List<MedManageParamsDTO> manageList= new ArrayList<>();
         for (MedManageParamsDTO medManageParam : medManageParams) {
             List<String> blood_list = QualityContent.getBlood_List();
+            String doctorAdviceType = medManageParam.getDoctorAdviceType();
+            String da_status = medManageParam.getDa_status();
+            String daItemName = medManageParam.getDaItemName();
+            String repName = medManageParam.getRepName();
             for (String str : blood_list) {
-                String daItemName = medManageParam.getDaItemName();
-                String repName = medManageParam.getRepName();
-                if(StringUtils.isNotEmpty(daItemName) && daItemName.contains(str) && StringUtils.isNotEmpty(repName) && repName.contains(str)){
+                if(StringUtils.isNotEmpty(daItemName) && daItemName.contains(str) && StringUtils.isNotEmpty(repName) && repName.contains(str) && StringUtils.isNotEmpty(doctorAdviceType) && doctorAdviceType.equals(QualityContent.STAT_ORDER) && StringUtils.isNotEmpty(da_status) && ! da_status.equals(QualityContent.CANCELLATION_ORDER)){
                     manageList.add(medManageParam);
                 }
             }
@@ -2862,8 +2866,8 @@ public class ConsoleFacade {
        cal2.set(Calendar.DAY_OF_MONTH, 1);
        cal2.set(Calendar.DATE, 1);//设为当前月的1号
        cal2.roll(Calendar.DATE, -1);
-       String startTime = myFormatter.format(cal1.getTime());
-       String endTime = myFormatter.format(cal2.getTime());
+       String startTime = myFormatter.format(cal1.getTime())+" 00:00:00";
+       String endTime = myFormatter.format(cal2.getTime())+" 23:59:59";
        filterVO.setStartDate(startTime);
        filterVO.setEndDate(endTime);
    };