1、缺陷反馈调整

pom.xml

@@ -33,7 +33,7 @@
         <!--<swagger-bootstrap.version>1.9.1</swagger-bootstrap.version>-->
         <logstash.version>5.2</logstash.version>
         <poi.version>4.1.1</poi.version>
-        <aggregator.version>1.1.0</aggregator.version>
+        <aggregator.version>1.1.3</aggregator.version>
         <okhttp.version>4.2.2</okhttp.version>
         <easypoi.version>4.2.0</easypoi.version>
         <patchca.version>1.1.2</patchca.version>

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -261,6 +261,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/consoleByDoctor/**").permitAll()
                 .antMatchers("/qc/getDoctorDetail/**").permitAll()
                 .antMatchers("/qc/data/dataSupplement").permitAll()
+                .antMatchers("/qc/supplement/*").permitAll()
                 .antMatchers("/**").authenticated();
         //                .antMatchers("/**").permitAll();
     }

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -386,6 +386,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/qc/getDoctorDetail/**", request)
                 || matchers("/qcView/data/*", request)
                 || matchers("/medDefectFeedback/*", request)
+                || matchers("/qc/supplement/*", request)
                 || matchers("/", request)) {
             return true;
         }

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

@@ -1,27 +1,33 @@
 package com.diagbot.facade;
 
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.*;
-import com.diagbot.entity.*;
+import com.diagbot.dto.AlgorithmDTO;
+import com.diagbot.dto.AnalyzeDTO;
+import com.diagbot.dto.QcCasesHistoryDTO;
+import com.diagbot.dto.QcResultDTO;
+import com.diagbot.entity.BehospitalInfo;
+import com.diagbot.entity.MedQcresultCases;
+import com.diagbot.entity.QcresultDetail;
+import com.diagbot.entity.QcresultInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.facade.data.AHomePageFacade;
-import com.diagbot.facade.data.AMedAbnormalInfoFacade;
 import com.diagbot.service.impl.MedQcresultCasesServiceImpl;
 import com.diagbot.service.impl.QcresultDetailServiceImpl;
 import com.diagbot.service.impl.QcresultInfoServiceImpl;
-import com.diagbot.util.*;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.StringUtil;
+import com.diagbot.util.SysUserUtils;
 import com.diagbot.vo.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -40,22 +46,10 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
     @Autowired
     private BehospitalInfoFacade behospitalInfoFacade;
     @Autowired
-    private AHomePageFacade aHomePageFacade;
-    @Autowired
-    private AMedAbnormalInfoFacade aMedAbnormalInfoFacade;
-    @Autowired
     private MedCheckInfoFacade medCheckInfoFacade;
     @Autowired
     @Qualifier("medQcresultCasesServiceImpl")
     private MedQcresultCasesServiceImpl medQcresultCasesService;
-    @Autowired
-    private QcCasesEntryFacade qcCasesEntryFacade;
-    @Autowired
-    private QcModeFacade qcModeFacade;
-    @Autowired
-    private SysUserFacade sysUserFacade;
-
-    private TZDBConnForHis tzDBConnForHis = new TZDBConnForHis();
 
     /**
      * 修改评分结果信息
@@ -269,67 +263,6 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
                 qcresultDetailAdd.setModifier(useId.toString());
                 qcresultDetailAdd.setQcresultInfoId(newId);
                 qcresultDetailServiceImpl.save(qcresultDetailAdd);
-                try {
-                    //发送质控人员新增人工缺陷到his系统
-                    SentEntryRecordDTO sentEntryRecordDTO = new SentEntryRecordDTO();
-                    BeanUtil.copyProperties(qcresultDetailAdd, sentEntryRecordDTO);
-                    MedCheckInfo medCheckInfo = medCheckInfoFacade.lambdaQuery()
-                            .eq(MedCheckInfo::getBehospitalCode, sentEntryRecordDTO.getBehospitalCode())
-                            .eq(MedCheckInfo::getHospitalId, qcresultDetailAdd.getHospitalId())
-                            //  .eq(MedCheckInfo::getStatus, 1)
-                            .in(MedCheckInfo::getCheckType, Arrays.asList(0, 2))
-                            .eq(MedCheckInfo::getIsDeleted, IsDeleteEnum.N.getKey()).one();
-                    if (null != medCheckInfo) {
-                        sentEntryRecordDTO.setCheckName(medCheckInfo.getCheckName());
-                        sentEntryRecordDTO.setCheckTime(medCheckInfo.getCheckTime());
-
-                        SysUser sysUser = sysUserFacade.lambdaQuery()
-                                .eq(SysUser::getId, medCheckInfo.getCheckId())
-                                .eq(SysUser::getStatus, 1)
-                                .eq(SysUser::getIsDeleted, IsDeleteEnum.N.getKey()).one();
-                        if (null != sysUser) {
-                            sentEntryRecordDTO.setCheckId(sysUser.getUsername());
-                        }
-                    }
-                    QcCasesEntry qcCasesEntry = qcCasesEntryFacade.lambdaQuery()
-                            .eq(QcCasesEntry::getId, qcresultDetailAdd.getCasesEntryId())
-                            .eq(QcCasesEntry::getIsDeleted, IsDeleteEnum.N.getKey()).one();
-                    if (null != qcCasesEntry) {
-                        QcMode qcMode = qcModeFacade.lambdaQuery()
-                                .eq(QcMode::getId, qcCasesEntry.getModeId())
-                                .eq(QcMode::getIsDeleted, IsDeleteEnum.N.getKey()).one();
-                        if (null != qcMode) {
-                            sentEntryRecordDTO.setModeName(qcMode.getName());
-                        }
-                    }
-                    //获取患者的科室id
-                    BehospitalInfo behospitalInfo = behospitalInfoFacade.getOne(new QueryWrapper<BehospitalInfo>()
-                            .eq("behospital_code", sentEntryRecordDTO.getBehospitalCode())
-                            .eq("is_deleted", IsDeleteEnum.N.getKey()));
-                    if (null != behospitalInfo) {
-                        sentEntryRecordDTO.setDeptId(behospitalInfo.getBehDeptId());
-                    }
-                    //根据his新增相应的数据
-                    try {
-                        //根据behospitalCode截取patientId和visitId
-                        String patientId = sentEntryRecordDTO.getBehospitalCode().split("_")[0];
-                        String visitId = sentEntryRecordDTO.getBehospitalCode().split("_")[1];
-                        //获取on_line表中的医生姓名
-                        String sql = "select * from doctor_hos where user_id = (select request_doctor_id from mr_on_line where patient ='" +
-                                patientId + "' and visit_id= '" + visitId + "' and status='0') and dept_code= '" + sentEntryRecordDTO.getDeptId() + "'";
-                        List<String> doctorNames = tzDBConnForHis.getdoctorName(sql);
-                        if (doctorNames != null && doctorNames.size() > 0) {
-                            sentEntryRecordDTO.setDoctorName(doctorNames.get(0));
-                        }
-                        Integer i = tzDBConnForHis.setQcMessAge(sentEntryRecordDTO);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("发送质控人员新增人工缺陷到his系统失败", "", "", JSON.toJSONString(sentEntryRecordDTO), e.getMessage());
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-
                 break;
             case 2:
                 //删除条目
@@ -340,24 +273,6 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
                 );
                 break;
             case 3:
-                try {
-                    //发送质控人员修改人工缺陷到his系统
-                    SentEntryRecordDTO updateEntryRecordDTO = new SentEntryRecordDTO();
-                    BeanUtil.copyProperties(algorithmVO.getOptResultAlgVO(), updateEntryRecordDTO);
-                    updateEntryRecordDTO.setBehospitalCode(analyzeVO.getBehospitalCode());
-                    QcresultDetail qcresultDetail = qcresultDetailServiceImpl.getOne(new QueryWrapper<QcresultDetail>()
-                            .eq("id", algorithmVO.getOptResultAlgVO().getId()));
-                    String oldMsg = qcresultDetail.getMsg();
-                    try {
-                        Integer i = tzDBConnForHis.UpdateQcMessAge(updateEntryRecordDTO, oldMsg);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("发送质控人员修改人工缺陷到his系统失败", "", "", JSON.toJSONString(updateEntryRecordDTO), e.getMessage());
-
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
                 //修改条目
                 qcresultDetailServiceImpl.update(new UpdateWrapper<QcresultDetail>()
                         .eq("id", algorithmVO.getOptResultAlgVO().getId())
@@ -375,22 +290,6 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
                 );
                 break;
             case 4:
-                try {
-                    //发送质控人员删除人工缺陷到his系统
-                    QcresultDetail deleteQcDetail = qcresultDetailServiceImpl.getOne(new QueryWrapper<QcresultDetail>()
-                            .eq("id", algorithmVO.getOptResultAlgVO().getId()));
-                    SentEntryRecordDTO deleteEntryRecordDTO = new SentEntryRecordDTO();
-                    deleteEntryRecordDTO.setMsg(deleteQcDetail.getMsg());
-                    deleteEntryRecordDTO.setBehospitalCode(analyzeVO.getBehospitalCode());
-                    try {
-                        Integer i = tzDBConnForHis.DeleteQcMessAge(deleteEntryRecordDTO);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                        aMedAbnormalInfoFacade.saveAbnormalInfo("发送质控人员删除人工缺陷到his系统失败", "", "", JSON.toJSONString(deleteEntryRecordDTO), e.getMessage());
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
                 //获取病历核查人员id，该操作只能是核查员操作
 //                Long checkId = medCheckInfoFacade.getOne(new QueryWrapper<MedCheckInfo>()
 //                        .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -518,11 +417,10 @@ public class QcresultInfoFacade extends QcresultInfoServiceImpl {
 
     /**
      * 历史评分
-     *
      * @param historyAnalyzePageVO
      * @return
      */
-    public IPage<QcCasesHistoryDTO> getMedQcresultResultList(HistoryAnalyzePageVO historyAnalyzePageVO) {
+    public IPage<QcCasesHistoryDTO> getMedQcresultResultList(HistoryAnalyzePageVO historyAnalyzePageVO){
         return getMedQcresultResult(historyAnalyzePageVO);
     }
 }

src/main/java/com/diagbot/facade/his/FeedbackHosFacade.java

@@ -26,8 +26,18 @@ public class FeedbackHosFacade {
             }else if(feedbackHosVO.getId()==null){
                 return RespDTO.onError("病历反馈缺陷ID为空");
             }
-            //其他情况新增
-            conn.setQcMessAge(feedbackHosVO);
+
+            if(!feedbackHosVO.getOperationType().equals("2") || !feedbackHosVO.getOperationType().equals("4")){
+                //先查询后新增删除
+                int count=conn.statusQueryBack(feedbackHosVO);
+                if(count>0){
+                    //修改
+                    conn.UpdateQcMessAge(feedbackHosVO);
+                }else{
+                    //其他情况新增
+                    conn.setQcMessAge(feedbackHosVO);
+                }
+            }
 
             return RespDTO.onSuc("推送缺陷反馈完成！");
         }catch (Exception e){

src/main/java/com/diagbot/facade/his/HisBehospitalInfoFacade.java

@@ -6,7 +6,6 @@ import com.diagbot.entity.his.HisBehospitalInfo;
 import com.diagbot.service.impl.his.HisBehospitalInfoServiceImpl;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.data.ABehospitalInfoVO;
-import com.diagbot.vo.data.HisDataDealVO;
 import com.diagbot.vo.data.HisDataImportVO;
 import com.google.common.collect.Lists;
 import io.github.lvyahui8.spring.facade.DataFacade;

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

@@ -133,22 +133,43 @@ public class PushFeedbackConn {
             connection = getConnection();
             connection.setAutoCommit(false);//事物开始
             PreparedStatement state=connection.prepareStatement("insert into MEDICAL_QC_MSG " +
-                    "(PATIENT_ID,VISIT_ID,DOCTOR_IN_CHARGE,QA_EVENT_TYPE,QC_MSG_CODE,MESSAGE,ISSUED_BY,ISSUED_DATE_TIME,TOPIC_ID,DEPT_STAYED,MSG_STATUS,EXPLAIN_INFO,QCRESULT_DETAI_SCORE,DETAIL_CODE)"+
-                    "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+                    "(PATIENT_ID,VISIT_ID,MESSAGE,ISSUED_BY,ISSUED_DATE_TIME,TOPIC_ID,DEPT_STAYED,MSG_STATUS,EXPLAIN_INFO,POINT,DETAIL_CODE" +
+                    ",CCIDS,POINT_TYPE,SENDER_DOCTOR,DOCTOR_IN_CHARGE_ID,APPLY_ENV,QA_EVENT_TYPE)"+
+                    "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
             state.setString(1, patientId);
             state.setString(2, visitId);
-            state.setString(3,feedbackHosVO.getSenderName());
-            state.setString(4,feedbackHosVO.getModeName());
-            state.setInt(5,1511);
-            state.setString(6,feedbackHosVO.getQcresultDetailMsg());
-            state.setString(7,"评价质控");
-            state.setString(8, DateUtil.formatDateTime(DateUtil.now()));
-            state.setString(9,feedbackHosVO.getModeName());
-            state.setString(10,feedbackHosVO.getDeptId());
-            state.setInt(11,0);
-            state.setString(12,feedbackHosVO.getExplainInfo());
-            state.setString(13, String.format("%.2f", feedbackHosVO.getQcresultDetaiScore()));
-            state.setString(14,Long.toString(feedbackHosVO.getId()));
+            state.setString(3,feedbackHosVO.getQcresultDetailMsg());
+            state.setString(4,"评价质控");
+            state.setString(5, DateUtil.formatDateTime(DateUtil.now()));
+            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()));
+            if(feedbackHosVO.getCasesEntryId()!=null){
+                state.setString(11,Long.toString(feedbackHosVO.getCasesEntryId()));//缺陷编号
+            }
+            state.setString(12,feedbackHosVO.getCcCodes());//抄送人工号集合
+            state.setString(13,"1");//扣分类型，0，自动扣分，1：手动扣分
+            state.setString(14,feedbackHosVO.getSenderCode());//提交人工号
+            state.setString(15,feedbackHosVO.getReceiverCode());//接收人工号
+            state.setString(16,"MEDDOC");
+            String operationType="";
+
+            if(feedbackHosVO.getOperationType().equals("1")){
+                operationType="修改";
+            }else if(feedbackHosVO.getOperationType().equals("2")){
+                operationType="删除";
+            }else if(feedbackHosVO.getOperationType().equals("3")){
+                operationType="新增已有";
+            }else if(feedbackHosVO.getOperationType().equals("4")){
+                operationType="新增缺失";
+            }else if(feedbackHosVO.getOperationType().equals("5")){
+                operationType="恢复";
+            }else {
+                operationType="其他";
+            }
+            state.setString(17,operationType);
             re = state.executeUpdate();
             if(re < 0){               //插入失败
                 connection.rollback();      //回滚
@@ -216,11 +237,42 @@ public class PushFeedbackConn {
             connection = getConnection();
             connection.setAutoCommit(false);//事物开始
             String sql =" update MEDICAL_QC_MSG set " +
-                    "MESSAGE = '"+feedbackHosVO.getQcresultDetailMsg()+"'" +
-                    ",EXPLAIN_INFO='"+feedbackHosVO.getExplainInfo()+"'" +
-                    ",QCRESULT_DETAI_SCORE='"+feedbackHosVO.getQcresultDetaiScore()+"'";
-            sql+="where PATIENT_ID = '"+patientId+"' and VISIT_ID = '"+visitId+"' and DETAIL_CODE='"+feedbackHosVO.getId()+"'";
+                    " MESSAGE=?,ISSUED_BY=?,ISSUED_DATE_TIME=?,TOPIC_ID=?,DEPT_STAYED=?,MSG_STATUS=?,EXPLAIN_INFO=?," +
+                    " POINT=?,CCIDS=?,POINT_TYPE=?,SENDER_DOCTOR=?,DOCTOR_IN_CHARGE_ID=?," +
+                    " APPLY_ENV=?,QA_EVENT_TYPE=?";
+            sql+=" where PATIENT_ID = ? and VISIT_ID = ? and DETAIL_CODE=?";
             PreparedStatement state=connection.prepareStatement(sql);
+            state.setString(1,feedbackHosVO.getQcresultDetailMsg());
+            state.setString(2,"评价质控");
+            state.setString(3, DateUtil.formatDateTime(DateUtil.now()));
+            state.setString(4,feedbackHosVO.getModeName());
+            state.setString(5,feedbackHosVO.getDeptId());
+            state.setInt(6,0);
+            state.setString(7,feedbackHosVO.getExplainInfo());//缺陷说明
+            state.setString(8, String.format("%.2f", feedbackHosVO.getQcresultDetaiScore()));
+            state.setString(9,feedbackHosVO.getCcCodes());//抄送人工号集合
+            state.setString(10,"1");//扣分类型，0，自动扣分，1：手动扣分
+            state.setString(11,feedbackHosVO.getSenderCode());//提交人工号
+            state.setString(12,feedbackHosVO.getReceiverCode());//接收人工号
+            state.setString(13,"MEDDOC");
+            String operationType="";
+            if(feedbackHosVO.getOperationType().equals("1")){
+                operationType="修改";
+            }else if(feedbackHosVO.getOperationType().equals("2")){
+                operationType="删除";
+            }else if(feedbackHosVO.getOperationType().equals("3")){
+                operationType="新增已有";
+            }else if(feedbackHosVO.getOperationType().equals("4")){
+                operationType="新增缺失";
+            }else if(feedbackHosVO.getOperationType().equals("5")){
+                operationType="恢复";
+            }else {
+                operationType="其他";
+            }
+            state.setString(14,operationType);
+            state.setString(15, patientId);
+            state.setString(16, visitId);
+            state.setString(17,Long.toString(feedbackHosVO.getCasesEntryId()));//缺陷编号
             re = state.executeUpdate();
             if(re < 0){               //修改失败
                 connection.rollback();      //回滚
@@ -266,4 +318,25 @@ public class PushFeedbackConn {
         return statusList;
     }
 
+    public int statusQueryBack(FeedbackHosVO feedbackHosVO){
+        int count=0;
+        String patientId=feedbackHosVO.getBehospitalCode().split("_")[0];
+        String visitId=feedbackHosVO.getBehospitalCode().split("_")[1];
+        try {
+            connection = getConnection();
+            connection.setAutoCommit(false);//事物开始
+            String sql =" select count(*) from MEDICAL_QC_MSG where PATIENT_ID = '"+patientId+"' and VISIT_ID = '"+visitId+"' and DETAIL_CODE='"+feedbackHosVO.getCasesEntryId()+"'";
+            rs =this.Query(sql, null);
+            if(rs.next()){
+                count=rs.getInt(1);
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        }finally {
+            close();
+        }
+        return count;
+    }
+
 }

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

@@ -352,13 +352,30 @@ public class TZDBConn {
                     homePageVO.setAcceptOrgCode(rs.getString("acceptOrgCode"));//接收机构名称
                     homePageVO.setAgainBehospitalPlan(rs.getString("againBehospitalPlan"));//31天内再住院计划
                     homePageVO.setAgainBehospitalGoal(rs.getString("againBehospitalGoal"));//再住院目的
+					//2022-05-09字段新增及调整
                     homePageVO.setTbiBeforeDay(rs.getString("tbiBeforeDay"));//颅脑损伤患者昏迷前天数
                     homePageVO.setTbiBeforeHour(rs.getString("tbiBeforeHour"));//颅脑损伤患者昏迷前小时
                     homePageVO.setTbiBeforeMinute(rs.getString("tbiBeforeMinute"));//颅脑损伤患者昏迷前分钟
                     homePageVO.setTbiAfterDay(rs.getString("tbiAfterDay"));//颅脑损伤患者昏迷后天数
                     homePageVO.setTbiAfterHour(rs.getString("tbiAfterHour"));//颅脑损伤患者昏迷后小时
                     homePageVO.setTbiAfterMinute(rs.getString("tbiAfterMinute"));//颅脑损伤患者昏迷后分钟
-                    homePageVO.setTotalFee(rs.getString("totalFee"));//总费用
+                    //新增字段
+					homePageVO.setMedicalRecordType(rs.getString("MEDICAL_RECORD_TYPE"));//病例分型
+					homePageVO.setIsIntensiveCare(rs.getString("IS_INTENSIVE_CARE"));//有无实施重症监护
+					homePageVO.setIntensiveCareLength(rs.getString("INTENSIVE_CARE_LENGTH"));//实施重症监护时长
+					homePageVO.setIntensiveCareDay(rs.getString("INTENSIVE_CARE_DAY"));//实施重症监护天
+					homePageVO.setIntensiveCareHour(rs.getString("INTENSIVE_CARE_HOUR"));//实施重症监护小时
+					homePageVO.setIsAntibioticUse(rs.getString("IS_ANTIBIOTIC_USE"));//是否抗生素使用
+					homePageVO.setDrgMangeMode(rs.getString("DRG_MANGE_MODE"));//实施DRG管理方式
+					homePageVO.setIsSobcsfe(rs.getString("IS_SOBCSFE"));//是否细菌培养标本送检
+					homePageVO.setLegalinfectiousDiseaseType(rs.getString("LEGALINFECTIOUS_DISEASE_TYPE"));//法定传染病类别
+					homePageVO.setTumourTStages(rs.getString("TUMOUR_T_STAGES"));//浸入的组织深度(肿瘤分期T)
+					homePageVO.setTumourNStages(rs.getString("TUMOUR_N_STAGES"));//淋巴结转移情况(肿瘤分期N)
+					homePageVO.setTumourMStages(rs.getString("TUMOUR_M_STAGES"));//远处转移情况(肿瘤分期M)
+					homePageVO.setTumourStages(rs.getString("TUMOUR_STAGES"));//肿瘤分期
+					homePageVO.setNewbornApgar(rs.getString("NEWBORN_APGAR"));//新生儿Apgar评分
+
+					homePageVO.setTotalFee(rs.getString("totalFee"));//总费用
                     homePageVO.setOwnFee(rs.getString("ownFee"));//自付金额
                     homePageVO.setGeneralFee(rs.getString("generalFee"));//一般医疗服务费
                     homePageVO.setServiceFee(rs.getString("serviceFee"));//一般治疗服务费
@@ -414,7 +431,8 @@ public class TZDBConn {
                     homePageVO.setComplicationsResults(rs.getString("complicationsResults"));//并发症
                     homePageVO.setInfectionSite(rs.getString("infectionSite"));//感染部位
                     homePageVO.setIsBeInDanger(rs.getString("isBeInDanger"));//住院期间有无告病危
-                    homePageList.add(homePageVO);
+                    
+					homePageList.add(homePageVO);
                 }
 //            }
 		} catch (Exception e) {
@@ -653,6 +671,12 @@ public class TZDBConn {
 				behospitalInfo.setIsPlacefile(rs.getString("isPlacefile"));//是否归档
 				behospitalInfo.setPlacefileDate(StringUtils.isNotBlank(rs.getString("placefileDate"))?DateUtil.parseDateTime(rs.getString("placefileDate")):null);//归档时间
 //				behospitalInfo.setInstate(rs.getString("Instate"));//病人状态
+				if(StringUtil.isNotEmpty(rs.getString("qc_type")) && rs.getString("qc_type").equals("1")){
+					//-是否质控 0:是 1:否   （质控规则 24小时内出院，无医嘱，费用为0）
+					behospitalInfo.setQcTypeId(0L);
+				}
+
+				behospitalInfo.setIsDaytime(rs.getString("IS_DAYTIME"));//是否日间病例,1:是，0:否
 				behospitalInfoList.add(behospitalInfo);
 			}
 		} catch (Exception e) {

src/main/java/com/diagbot/vo/his/FeedbackHosVO.java

@@ -11,6 +11,10 @@ public class FeedbackHosVO {
     private String ids;
 
     private Long id;
+    /**
+     * 条目ID
+     */
+    private Long casesEntryId;
     /**
      * 操作类型 1:修改|2:删除|3:新增已有|4:新增缺失|5:恢复
      */

src/main/java/com/diagbot/web/DataController.java

@@ -13,14 +13,12 @@ import io.github.lvyahui8.spring.facade.DataFacade;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.validation.Valid;
-import java.lang.reflect.InvocationTargetException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

src/main/resources/application-his.yml

@@ -83,6 +83,7 @@ spring:
         maxPoolPreparedStatementPerConnectionSize: 20
         # 配置监控统计拦截的filters，去掉后监控界面sql无法统计，'wall'用于防火墙
         filters.commons-log.connection-logger-name: wall,log4j
+        share-prepared-statements: false
         filter:
           stat:
             enabled: true
@@ -105,12 +106,12 @@ spring:
       datasource:
         master:
           driver-class-name: com.mysql.cj.jdbc.Driver
-            platform: mysql
-            url: jdbc:mysql://132.147.253.32:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-            username: root
-            password: lantone
-            druid:
-              initial-size: 5
+          platform: mysql
+          url: jdbc:mysql://132.147.253.32:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+          username: root
+          password: lantone
+          druid:
+            initial-size: 5
         slave:
           driver-class-name: oracle.jdbc.driver.OracleDriver
           platform: oracle

src/main/resources/application-local.yml

@@ -104,7 +104,7 @@ spring:
         master:
           driver-class-name: com.mysql.cj.jdbc.Driver
           platform: mysql
-          url: jdbc:mysql://192.168.2.237:3307/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+          url: jdbc:mysql://192.168.2.237:3307/qc_xiangya_ts?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
           username: root
           password: lantone
           druid:
@@ -144,7 +144,7 @@ spring:
 
 #mybatis
 mybatis-plus:
-  mapper-locations: classpath:/mapper/*Mapper.xml
+  mapper-locations: classpath:/mapper/*Mapper.xml,classpath:/mapper/his/*Mapper.xml
   #实体扫描，多个package用逗号或者分号分隔
   typeAliasesPackage: com.diagbot.entity
   global-config:

src/main/resources/bootstrap.yml

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

src/main/resources/logback-spring.xml

@@ -185,7 +185,7 @@
         </encoder>
         <!--此日志appender是为开发使用，只配置最底级别，控制台输出的日志级别是大于或等于此级别的日志信息-->
         <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>error</level>
+            <level>debug</level>
         </filter>
     </appender>