Merge remote-tracking branch 'origin/his/yiwufuyou_new' into his/yiwufuyou_new

src/main/java/com/diagbot/facade/data/AHomePageFacade.java

@@ -6,11 +6,12 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.AnalyzeRunDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomePageDTO;
-import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.entity.HomePage;
+import com.diagbot.entity.MedicalRecord;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.data.*;
 import com.diagbot.facade.BehospitalInfoFacade;
+import com.diagbot.facade.MedicalRecordFacade;
 import com.diagbot.service.impl.HomePageServiceImpl;
 import com.diagbot.util.*;
 import com.diagbot.vo.AnalyzeRunVO;
@@ -48,9 +49,13 @@ public class AHomePageFacade extends HomePageServiceImpl{
 
     @Autowired
     private ReadProperties readProperties;
+
     @Autowired
     private SqlProperties sqlProperties;
 
+    @Autowired
+    private MedicalRecordFacade medicalRecordFacade;
+
 
     @Value("${log_switch.enable}")
     private boolean logSwitch;
@@ -116,6 +121,14 @@ public class AHomePageFacade extends HomePageServiceImpl{
                     }else if(StringUtil.isEmpty(aHomePageVO.getBehospitalCode())){
                         return RespDTO.onError("请输入病人住院编码!");
                     }
+                    //更新病案首页记录创建时间
+                    MedicalRecord medicalRecord = medicalRecordFacade.lambdaQuery()
+                            .eq(MedicalRecord::getBehospitalCode, aHomePageVO.getBehospitalCode())
+                            .eq(MedicalRecord::getModeId, 6)//病案首页
+                            .eq(MedicalRecord::getHospitalId, aHomePageVO.getHospitalId())
+                            .one();
+                    aHomePageVO.setGmtCreate(String.valueOf(medicalRecord.getRecDate()));
+                    aHomePageVO.setGmtModified(String.valueOf(medicalRecord.getRecDate()));
                     //出院诊断
                     if(aHomePageVO.getLeaveDiags()!=null && aHomePageVO.getLeaveDiags().size()>0){
                         for (AHomeDiagnoseVO aHomeDiagnoseVO:aHomePageVO.getLeaveDiags()){

src/main/java/com/diagbot/vo/data/AHomePageVO.java

@@ -647,4 +647,14 @@ public class AHomePageVO {
      * 手术情况
      */
     private List<AHomeOperationVO> operations;
+
+    /**
+     * 记录创建时间
+     */
+    private String gmtCreate;
+
+    /**
+     * 记录修改时间
+     */
+    private String gmtModified;
 }