视图数据更新

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/common/CommonUtil.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.medical.common;
 
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.system.vo.DictModel;
@@ -85,6 +86,26 @@ public class CommonUtil {
         return projectUseTime.toString();
     }
 
+    public static String getProjectUseTime(Object projectUseTime) {
+        if (null == projectUseTime) {
+            return null;
+        }
+        if (projectUseTime instanceof String) {
+            String projectUseTimeStr = (String) projectUseTime;
+            return projectUseTimeStr;
+        } else if (projectUseTime instanceof java.util.Date || projectUseTime instanceof java.sql.Date) {
+            Date projectUseTimeDate = (Date) projectUseTime;
+            return DateUtil.format(projectUseTimeDate, DatePattern.NORM_DATETIME_PATTERN);
+        } else if (projectUseTime instanceof java.lang.Long) {
+            Date projectUseTimeDate = new Date(((Long) projectUseTime));
+            return DateUtil.format(projectUseTimeDate, DatePattern.NORM_DATETIME_PATTERN);
+
+        } else {
+            log.error("时间类型匹配不上:{}", projectUseTime.getClass());
+        }
+        return projectUseTime.toString();
+    }
+
 
 
     public static Integer getDays(String ageString) {

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/MidIncidentAuditDetail.java

@@ -199,4 +199,13 @@ public class MidIncidentAuditDetail implements Serializable {
     @DateTimeFormat(pattern= "yyyy-MM-dd HH:mm:ss")
     @ApiModelProperty(value = "更新时间")
     private java.util.Date updateTime;
+
+    @ApiModelProperty(value = "项目使用时间")
+    private String projectUseTime;
+
+    private String patientGender;
+
+    private String patientAge;
+
+    private Double patientAgeDays;
 }

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/ruleengine/FactorEnchangeFactory.java

@@ -284,10 +284,10 @@ public class FactorEnchangeFactory {
                     afterwardsAuditDetail.setPrice(new BigDecimal(priceObj.toString()));
                 }
                 Object projectUseTime = otherMap.get(SystemEventAttrConstant.PROJECT_USE_TIME);
-                if (null != projectUseTime) {
-                    String projectUseTimeStr = DateUtil.formatDateTime((Date) projectUseTime);
-                    afterwardsAuditDetail.setProjectUseTime(projectUseTimeStr);
-                }
+
+                String projectUseTimeStr = CommonUtil.getProjectUseTime(projectUseTime);
+                afterwardsAuditDetail.setProjectUseTime(projectUseTimeStr);
+
                 afterwardsAuditDetail.setUseDay((Integer) itemMap.getOrDefault(SystemEventAttrConstant.USE_DAY, 1));
                 afterwardsAuditDetail.setPatientAge(itemMap.getOrDefault(SystemEventAttrConstant.PATIENT_AGE_KEY, "1").toString());
                 afterwardsAuditDetail.setPatientGender(itemMap.getOrDefault(SystemEventAttrConstant.PATIENT_GENDER_KEY,"3").toString());
@@ -330,10 +330,10 @@ public class FactorEnchangeFactory {
 //            afterwardsAuditDetail.setReminderLevel();
             afterwardsAuditDetail.setCreateBy("auto");
             Object projectUseTime = itemMap.get(SystemEventAttrConstant.PROJECT_USE_TIME);
-            if (null != projectUseTime) {
-                String projectUseTimeStr = DateUtil.formatDateTime((Date) projectUseTime);
-                afterwardsAuditDetail.setProjectUseTime(projectUseTimeStr);
-            }
+
+            String projectUseTimeStr = CommonUtil.getProjectUseTime(projectUseTime);
+            afterwardsAuditDetail.setProjectUseTime(projectUseTimeStr);
+
             afterwardsAuditDetail.setPatientAge(itemMap.getOrDefault(SystemEventAttrConstant.PATIENT_AGE_KEY, "1").toString());
             afterwardsAuditDetail.setPatientGender(itemMap.getOrDefault(SystemEventAttrConstant.PATIENT_GENDER_KEY,"3").toString());
             afterwardsAuditDetail.setUseDay((Integer) itemMap.getOrDefault(SystemEventAttrConstant.USE_DAY, 1));