逻辑修改

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

@@ -391,7 +391,7 @@ public class ConsoleFacade {
      * @return 2170
      */
     public List<Map<String, String>> medicalRecordIndicator(FilterVO filterVO){
-        filterFacade.filterVOSet(filterVO);
+        filterFacade.filterSet(filterVO);
         String indexName = filterVO.getIndexName();
         List<Map<String, String>> hashMapArrayList = new ArrayList<>();
         long zz = System.currentTimeMillis();
@@ -544,7 +544,7 @@ public class ConsoleFacade {
             long x1 = System.currentTimeMillis();
             System.out.println("qian" + (zz-x1));
             Map<String, Object> baseIndex = behospitalInfoFacade.getBaseIndex(filterVO);
-        //指标一、二、三、二十七
+        //指标一、二、三
             if (QualityContent.FOURSTR.contains(indexName)||indexName.equals(QualityContent.QB)) {
                 hashMapArrayList = ManageIndexMethod(indexName, hashMapArrayList, baseIndex, filterVO);
             }
@@ -703,7 +703,7 @@ public class ConsoleFacade {
                 String behospitalCode = adviceMedManageParam.getBehospitalCode();
                 String doctorAdviceType = adviceMedManageParam.getDoctorAdviceType();
                 String daStatus = adviceMedManageParam.getDaStatus();
-                if(StringUtil.isEmpty(daStatus)&&!daStatus.equals(QualityContent.CANCELLATION_ORDER)||StringUtil.isEmpty(daStatus)){
+                if(StringUtil.isEmpty(daStatus) || (!daStatus.equals(QualityContent.CANCELLATION_ORDER) && StringUtil.isNotEmpty(daStatus))){
                     //得到与手术相关
                     if (StringUtil.isNotEmpty(daItemName)) {
                         if (QualityContent.NORecord_NEED_MEDICAL_ADVICE.contains(indexName)) {
@@ -2703,7 +2703,7 @@ public class ConsoleFacade {
             String doctorAdviceType = medManageParams.get(i).getDoctorAdviceType();
             String da_status = medManageParams.get(i).getDaStatus();
             for (String str : rescueDrugList) {
-                if(StringUtils.isNotEmpty(daItemName) && daItemName.contains(str) && StringUtils.isNotEmpty(doctorAdviceType) && doctorAdviceType.equals(QualityContent.STAT_ORDER) && (da_status == null || (StringUtils.isNotEmpty(da_status) && ! doctorAdviceType.equals(QualityContent.CANCELLATION_ORDER)))){
+                if(StringUtils.isNotEmpty(daItemName) && daItemName.contains(str) && StringUtils.isNotEmpty(doctorAdviceType) && doctorAdviceType.equals(QualityContent.STAT_ORDER) && (StringUtils.isEmpty(da_status) || (StringUtils.isNotEmpty(da_status) && ! doctorAdviceType.equals(QualityContent.CANCELLATION_ORDER)))){
                     manageList.add(medManageParams.get(i));
                 }
             }
@@ -2770,7 +2770,7 @@ public class ConsoleFacade {
         doctorAdviceList.parallelStream()
               .filter(obj -> beCode.contains(obj.getBehospitalCode()) && obj.getDoctorAdviceType()
                       .equals(QualityContent.STAT_ORDER) && blood_list.contains(obj.getDaItemName()) &&
-                      (obj.getDaStatus() == null) || (StringUtils.isNotEmpty(obj.getDaStatus()) && ! obj.getDaStatus()
+                      (StringUtils.isEmpty(obj.getDaStatus())) || (StringUtils.isNotEmpty(obj.getDaStatus()) && ! obj.getDaStatus()
                       .equals(QualityContent.CANCELLATION_ORDER)))
                 .distinct()
               .map(obj -> manageList.add(obj.getBehospitalCode()))

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

@@ -209,6 +209,32 @@ public class FilterFacade {
         }*/
     }
 
+    /**
+     * 入参拼接
+     *
+     * @param filterVO
+     */
+    public void filterSet(FilterVO filterVO) {
+        String hospitalId = SysUserUtils.getCurrentHospitalID();
+        String userId = SysUserUtils.getCurrentPrincipleID();
+        filterVO.setHospitalId(hospitalId);
+        filterVO.setUserId(Long.valueOf(userId));
+        if (filterVO.getLimitCount() == null || filterVO.getLimitCount().equals(0)) {
+            filterVO.setLimitCount(10);
+        }
+            try {
+                SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+                SimpleDateFormat dateFormatSec = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                Date dateStart = dateFormat.parse(filterVO.getStartDate());
+                Date dateEnd = dateFormat.parse(filterVO.getEndDate());
+                filterVO.setStartDate(dateFormatSec.format(dateStart));
+                filterVO.setEndDate(dateFormatSec.format(dateEnd));
+            } catch (ParseException e) {
+
+            }
+
+    }
+
     /**
      * 分页入参拼接
      *