0221

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

@@ -173,7 +173,12 @@ public class ABehospitalInfoFacade extends BehospitalInfoServiceImpl {
      */
     private Long initQcTypeId(BehospitalInfo s) {
         // 如果是婴儿（isBaby = 1），或者为取消入院的病人，质控类型直接返回0，不进行质控
-        if (s.getIsCancelBehospital().equals("1")||s.getIsBaby().equals("1") || s.getName().contains("之子") || s.getName().contains("之女")) {
+        if (s.getIsCancelBehospital().equals("1")||s.getIsBaby().equals("1")) {
+            return 0L;
+        }
+        if ((s.getName().contains("之子") || s.getName().contains("之女")) &&
+                (s.getFileCode().startsWith("a")||s.getFileCode().startsWith("b")||s.getFileCode().startsWith("c")
+                ||s.getFileCode().startsWith("d")||s.getFileCode().startsWith("e")||s.getFileCode().startsWith("f"))) {
             return 0L;
         }
         //如果是日间病例，质控类型直接写死返回129（日间病房（男））这个后期要改

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

@@ -7,7 +7,6 @@ import com.diagbot.dto.AnalyzeRunDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomePageDTO;
 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;
@@ -127,13 +126,9 @@ public class AHomePageFacade extends HomePageServiceImpl {
                         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()));
+                    Date now = DateUtil.now();
+                    aHomePageVO.setGmtCreate(now);
+                    aHomePageVO.setGmtModified(now);
                     //出院诊断
                     if (aHomePageVO.getLeaveDiags() != null && aHomePageVO.getLeaveDiags().size() > 0) {
                         for (AHomeDiagnoseVO aHomeDiagnoseVO : aHomePageVO.getLeaveDiags()) {

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

@@ -79,7 +79,6 @@ public class SendDataDealFacade {
 //            String sql = "select * from   AI_V_SENDPATIENTINFO where behospitalCode = '"+code+"'";
             String sql = "SELECT * FROM AI_V_SENDPATIENTINFO t WHERE t.BEHOSPITALCODE='" + code + "'";
             behospitalInfos = tzDBConn.getBehospitalInfo(sql);
-            aMedAbnormalInfoFacade.saveAbnormalInfo("sendDataDealOne","按照住院号查询", sql, "", "");
             if (StringUtil.isNotBlank(doctorID) && doctorID.equals("1")) {
                 //拉取时更新各医生姓名
                 for (BehospitalInfo info : behospitalInfos) {
@@ -126,7 +125,6 @@ public class SendDataDealFacade {
                 sql = "select * from AI_V_SENDPATIENTINFO t where to_char(t.behospitalDate,'yyyymmdd')>= '" + startDate + " ' " +
                         " and to_char(t.behospitalDate,'yyyymmdd')<= '" + stopDate + " '";
             }
-            aMedAbnormalInfoFacade.saveAbnormalInfo("sendDataDeal","按照日期查询", sql, "", "");
             behospitalInfos = tzDBConn.getBehospitalInfo(sql);
 
             if (StringUtil.isNotBlank(doctorID) && doctorID.equals("1")) {
@@ -204,6 +202,10 @@ public class SendDataDealFacade {
         try {
             String sql = "select * from AI_V_SENDMRRECORDINGGD where RECID= '" + recId + "'";
             List<MedicalRecordContent> medicalRecordContents = tzDBConn.getMedicalRecordContent(sql);
+            if(medicalRecordContents.size()== 0){
+                sql = "select * from AI_V_SENDMRRECORDING where RECID= '" + recId + "'";
+                medicalRecordContents = tzDBConn.getMedicalRecordContent(sql);
+            }
             aMedicalRecordContentFacade.execute(medicalRecordContents);
         } catch (Exception e) {
             aMedAbnormalInfoFacade.saveAbnormalInfo("获取文书详情历史数据", recId, "", "", e.getMessage());

src/main/java/com/diagbot/util/TZDBConn.java

@@ -469,7 +469,6 @@ public class TZDBConn {
 				behospitalInfo.setHospitalCampusId(rs.getString("YUANQUID"));//院区id
 				behospitalInfoList.add(behospitalInfo);
 			}
-			aMedAbnormalInfoFacade.saveAbnormalInfo("获取病历信息-语句查询对应TZDBConn","查询出的总数"+i, sql,"","");
 		} catch (Exception e) {
 			e.printStackTrace();
 		}finally {

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

@@ -3,6 +3,7 @@ package com.diagbot.vo.data;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
 import java.util.List;
 
 @Getter
@@ -651,10 +652,10 @@ public class AHomePageVO {
     /**
      * 记录创建时间
      */
-    private String gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间
      */
-    private String gmtModified;
+    private Date gmtModified;
 }

src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: mrqc-sys
   profiles:
-    active: test
+    active: local
   main:
     allow-bean-definition-overriding: true