1、缺陷反馈调整；

2、补录调整

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

@@ -259,7 +259,7 @@ public class ViewFacade {
                 //获取检查信息和相应的检查结果并添加修改
                 String pacsSql = "select * from CHECK_LIST where behospitalCode= '" + hospitalCode + "' and behospitalnum= '" + hospitalNum + "'";
                 this.getPacsInfo(pacsSql);
-                try {
+                /*try {
                     //拉取数据完后评分
                     AnalyzeRunVO analyzeRunVO = new AnalyzeRunVO();
                     analyzeRunVO.setHospitalId(Long.valueOf("35"));
@@ -267,7 +267,7 @@ public class ViewFacade {
                     behospitalInfoFacade.analyzeApi(analyzeRunVO);
                 } catch (Exception e) {
                     aMedAbnormalInfoFacade.saveAbnormalInfo("历史数据拉取完评分异常", "", "", JSON.toJSONString(s), e.getMessage());
-                }
+                }*/
             });
             aMedAbnormalInfoFacade.saveAbnormalInfo("历史数据拉取完成", "", "", JSON.toJSONString(behospitalInfoList), "");
         }
@@ -346,8 +346,8 @@ public class ViewFacade {
             homeDiagnoseInfos = tzDBConn.getHomeDiagnose(sql);
             if(ListUtil.isNotEmpty(homeDiagnoseInfos)){
                 homeDiagnoseInfos.stream().forEach(s->{
-                    diagnoseName.append(s.getDiagnoseName());
-                    diagnoseCode.append(s.getIcdCode());
+                    diagnoseName.append(s.getDiagnoseName()+",");
+                    diagnoseCode.append(s.getIcdCode()+",");
                     homePage.setHomePageId(s.getHomePageId());
                 });
             }
@@ -531,11 +531,11 @@ public class ViewFacade {
             medicalRecordList = tzDBConn.getMedicalRecord(sql);
             if (medicalRecordList.size() > 0) {
                 medicalRecordList.forEach(s -> {
-                    /*//获取文书详情
+                    //获取文书详情
                     String recId = s.getRecId();
                     //截取rec_id後面的_次數跟接口相對潁上
                     int inedx = s.getRecId().lastIndexOf("_");
-                    s.setRecId(s.getRecId().substring(0, inedx));*/
+                    s.setRecId(s.getRecId().substring(0, inedx));
                     this.getRecordContent(s.getRecId());
                 });
             }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.entity.DoctorAdvice;
+import com.diagbot.entity.HomePage;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.DoctorAdviceServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -96,19 +97,24 @@ public class ADoctorAdviceFacade extends DoctorAdviceServiceImpl{
                 if (doctorAdvice != null) {
                     s.setIsDeleted(IsDeleteEnum.N.getKey());
                     s.setGmtModified(DateUtil.now());
-                    updateE.add(s);
+                    this.update(s,new UpdateWrapper<DoctorAdvice>()
+                            .eq("doctor_advice_id", s.getDoctorAdviceId())
+                            .eq("hospital_id", s.getHospitalId())
+                            .eq("behospital_code", s.getBehospitalCode()));
+                    //updateE.add(s);
                 } else {
                     s.setGmtCreate(new Date());
-                    addE.add(s);
+                    this.save(s);
+                    //addE.add(s);
                 }
             });
         }
-        if(addE.size()>0){
+        /*if(addE.size()>0){
             doctorAdviceService.saveBatch(addE);
         }
         if(updateE.size()>0){
             doctorAdviceService.updateBatchByKey(updateE);
-        }
+        }*/
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomeDiagnoseDTO;
 import com.diagbot.entity.HomeDiagnoseInfo;
+import com.diagbot.entity.HomeOperationInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.HomeDiagnoseInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -77,20 +78,25 @@ public class AHomeDiagnoseInfoFacade extends HomeDiagnoseInfoServiceImpl{
                     if (diagnoseInfo != null) {
                         s.setGmtModified(new Date());
                         s.setIsDeleted(IsDeleteEnum.N.getKey());
-                        updateE.add(s);
+                        this.update(s,new UpdateWrapper<HomeDiagnoseInfo>()
+                                .eq("home_page_id", s.getHomePageId())
+                                .eq("hospital_id", s.getHospitalId())
+                                .eq("diagnose_order_no", s.getDiagnoseOrderNo()));
+                        //updateE.add(s);
                     } else {
                         s.setGmtCreate(new Date());
-                        addE.add(s);
+                        this.save(s);
+                        //addE.add(s);
                     }
                 }
             });
         }
-        if(addE.size()>0){
+        /*if(addE.size()>0){
             homeDiagnoseInfoService.saveBatch(addE);
         }
         if(updateE.size()>0){
             homeDiagnoseInfoService.updateBatchByKey(updateE);
-        }
+        }*/
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.data.AHomeOperationDTO;
 import com.diagbot.entity.HomeOperationInfo;
+import com.diagbot.entity.MedicalRecordContent;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.HomeOperationInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -82,20 +83,25 @@ public class AHomeOperationInfoFacade extends HomeOperationInfoServiceImpl{
                     if (operationInfo != null) {
                         s.setGmtModified(new Date());
                         s.setIsDeleted(IsDeleteEnum.N.getKey());
-                        updateE.add(s);
+                        this.update(s,new UpdateWrapper<HomeOperationInfo>()
+                                .eq("home_page_id", s.getHomePageId())
+                                .eq("operation_order_no", s.getOperationOrderNo())
+                                .eq("hospital_id", s.getHospitalId()));
+                        //updateE.add(s);
                     } else {
                         s.setGmtCreate(new Date());
-                        addE.add(s);
+                        this.save(s);
+                        //addE.add(s);
                     }
                 }
             });
         }
-        if(addE.size()>0){
+        /*if(addE.size()>0){
             homeOperationInfoService.saveBatch(addE);
         }
         if(updateE.size()>0){
             homeOperationInfoService.updateBatchByKey(updateE);
-        }
+        }*/
     }
 
     public RespDTO deleteFlag(ADeleteFlagVO aDeleteFlagVO){

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

@@ -10,6 +10,7 @@ import com.diagbot.dto.data.AHomePageDTO;
 import com.diagbot.entity.BasDoctorInfo;
 import com.diagbot.entity.BehospitalInfo;
 import com.diagbot.entity.HomePage;
+import com.diagbot.entity.MedicalRecordContent;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.facade.BehospitalInfoFacade;
 import com.diagbot.service.impl.HomePageServiceImpl;
@@ -246,10 +247,15 @@ public class AHomePageFacade extends HomePageServiceImpl{
                     if (homePage != null) {
                         s.setGmtModified(new Date());
                         s.setIsDeleted(IsDeleteEnum.N.getKey());
-                        updateE.add(s);
+                        this.update(s,new UpdateWrapper<HomePage>()
+                                .eq("home_page_id", s.getHomePageId())
+                                .eq("hospital_id", s.getHospitalId())
+                                .eq("behospital_code", s.getBehospitalCode()));
+                        //updateE.add(s);
                     } else {
                         s.setGmtCreate(new Date());
-                        addE.add(s);
+                        this.save(s);
+                        //addE.add(s);
                     }
                     try{
                         //从病案首页同步入院登记表中的住院医生behospitalDoctor，主治医生attendingDoctor和主任医生directorDoctor和ID
@@ -283,12 +289,12 @@ public class AHomePageFacade extends HomePageServiceImpl{
                 });
 
             }
-            if(addE.size()>0){
+            /*if(addE.size()>0){
                 homePageService.saveBatch(addE);
             }
             if(updateE.size()>0){
                 homePageService.updateBatchByKey(updateE);
-            }
+            }*/
         }catch (Exception e){
             log.error(e.getMessage(),e);
             aMedAbnormalInfoFacade.saveAbnormalInfo("病案首页异常","", JSON.toJSONString(homePageList),"",e.getMessage());

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

@@ -86,6 +86,7 @@ public class AMedicalRecordContentFacade extends MedicalRecordContentServiceImpl
                         MedicalRecordContent mrContent = this.getOne(queryWrapper, false);
                         if (mrContent != null) {
                             s.setGmtModified(new Date());
+                            s.setIsDeleted(IsDeleteEnum.N.getKey());
                             this.update(s,new UpdateWrapper<MedicalRecordContent>()
                                     .eq("rec_id", s.getRecId())
                                     .eq("hospital_id", s.getHospitalId()));

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

@@ -447,11 +447,11 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                     } else {
                         s.setGmtCreate(new Date());
                         this.save(s);
-//                        addE.add(s);
+                        //addE.add(s);
                     }
                 });
             }
-            /*if (addE.size() > 0) {
+           /* if (addE.size() > 0) {
                 medicalRecordService.saveBatch(addE);
             }
             if (updateE.size() > 0) {

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

@@ -1,9 +1,9 @@
 package com.diagbot.util;
 
-import com.diagbot.entity.BasDoctorInfo;
 import com.diagbot.vo.his.FeedbackHosVO;
 import com.google.common.collect.Lists;
 
+import java.math.BigDecimal;
 import java.sql.*;
 import java.util.List;
 import java.util.ResourceBundle;
@@ -134,18 +134,18 @@ public class PushFeedbackConn {
             connection.setAutoCommit(false);
             PreparedStatement state=connection.prepareStatement("insert into MEDICAL_QC_MSG " +
                     "(PATIENT_ID,VISIT_ID,MESSAGE,ISSUED_BY,ISSUED_DATE_TIME,TOPIC_ID,DEPT_STAYED,MSG_STATUS,EXPLAININFO,POINT,DETAILCODE" +
-                    ",CCIDS,POINT_TYPE,SENDER_DOCTOR,DOCTOR_IN_CHARGE_ID,APPLY_ENV,QA_EVENT_TYPE,QC_MSG_CODE)"+
-                    "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+                    ",CCIDS,POINT_TYPE,SENDER_DOCTOR,DOCTOR_IN_CHARGE_ID,APPLY_ENV,QA_EVENT_TYPE,QC_MSG_CODE,DOCTOR_IN_CHARGE)"+
+                    "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
             state.setString(1, patientId);
             state.setString(2, visitId);
             state.setString(3,feedbackHosVO.getQcresultDetailMsg());
             state.setString(4,"评价质控");
-            state.setString(5, DateUtil.formatDateTime(DateUtil.now()));
+            state.setDate(5, Date.valueOf(DateUtil.getCurrentDateStr("")));
             state.setString(6,feedbackHosVO.getModeName());
             state.setString(7,feedbackHosVO.getDeptId());
             state.setInt(8,0);
             state.setString(9,feedbackHosVO.getExplainInfo());//缺陷说明
-            state.setString(10, String.format("%.2f", feedbackHosVO.getQcresultDetaiScore()));
+            state.setInt(10, feedbackHosVO.getQcresultDetaiScore().intValue());
             if(feedbackHosVO.getCasesEntryId()!=null){
                 state.setString(11,Long.toString(feedbackHosVO.getCasesEntryId()));//缺陷编号
             }
@@ -171,6 +171,7 @@ public class PushFeedbackConn {
             }
             state.setString(17,operationType);
             state.setString(18,Long.toString(feedbackHosVO.getModeId()));
+            state.setString(19,feedbackHosVO.getReceiverName());//接收人姓名
             re = state.executeUpdate();
             if(re < 0){               //插入失败
                 connection.rollback();      //回滚
@@ -189,7 +190,11 @@ public class PushFeedbackConn {
         }finally {
             close();
         }
+    }
 
+    public static void main(String[] args) {
+        BigDecimal number = new BigDecimal(12.22);
+        System.out.println(number.intValue());
     }
 
     /**
@@ -240,12 +245,12 @@ public class PushFeedbackConn {
             String sql =" update MEDICAL_QC_MSG set " +
                     " MESSAGE=?,ISSUED_BY=?,ISSUED_DATE_TIME=?,TOPIC_ID=?,DEPT_STAYED=?,MSG_STATUS=?,EXPLAININFO=?," +
                     " POINT=?,CCIDS=?,POINT_TYPE=?,SENDER_DOCTOR=?,DOCTOR_IN_CHARGE_ID=?," +
-                    " APPLY_ENV=?,QA_EVENT_TYPE=?,QC_MSG_CODE=?";
+                    " APPLY_ENV=?,QA_EVENT_TYPE=?,QC_MSG_CODE=?,DOCTOR_IN_CHARGE=?";
             sql+=" where PATIENT_ID = ? and VISIT_ID = ? and DETAILCODE=?";
             PreparedStatement state=connection.prepareStatement(sql);
             state.setString(1,feedbackHosVO.getQcresultDetailMsg());
             state.setString(2,"评价质控");
-            state.setString(3, DateUtil.formatDateTime(DateUtil.now()));
+            state.setDate(3, Date.valueOf(DateUtil.getCurrentDateStr("")));
             state.setString(4,feedbackHosVO.getModeName());
             state.setString(5,feedbackHosVO.getDeptId());
             state.setInt(6,0);
@@ -271,10 +276,12 @@ public class PushFeedbackConn {
                 operationType="其他";
             }
             state.setString(14,operationType);
-            state.setString(15, patientId);
-            state.setString(16, visitId);
-            state.setString(17,Long.toString(feedbackHosVO.getCasesEntryId()));//缺陷编号
-            state.setString(18,Long.toString(feedbackHosVO.getModeId()));
+            state.setString(15,Long.toString(feedbackHosVO.getModeId()));
+            state.setString(16,feedbackHosVO.getReceiverName());//接收人姓名
+            state.setString(17, patientId);
+            state.setString(18, visitId);
+            state.setString(19,Long.toString(feedbackHosVO.getCasesEntryId()));//缺陷编号
+
             re = state.executeUpdate();
             if(re < 0){               //修改失败
                 connection.rollback();      //回滚