1、缺陷反馈调整；

2、补录调整

doc/046.20220420v2.5.0_个性化版_湘雅人工质控缺陷反馈/qc_init_v2.5.0_个性化版_湘雅人工质控缺陷反馈.sql

@@ -25,7 +25,7 @@ med_behospital_info 病历表新增字段
  */
 ALTER TABLE `med_behospital_info`
 ADD COLUMN `is_daytime`  varchar(2) NOT NULL DEFAULT 0 COMMENT '是否日间病例,1:是，0:否' AFTER `is_placefile`;
-ALTER TABLE `med_behospital_info` ADD COLUMN `qc_type` VARCHAR(2) NOT NULL DEFAULT 0 COMMENT '是否质控0:是1:否' AFTER `is_daytime`;
+ALTER TABLE `med_behospital_info` ADD COLUMN `is_qc_type` VARCHAR(2) NOT NULL DEFAULT 0 COMMENT '是否质控0:是1:否' AFTER `is_daytime`;
 
 
 /**

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

@@ -1,11 +1,14 @@
 package com.diagbot.util;
 
 import com.diagbot.vo.his.FeedbackHosVO;
+import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
 
 import java.sql.*;
+import java.util.Arrays;
 import java.util.List;
 import java.util.ResourceBundle;
+import java.util.stream.Collectors;
 
 public class PushFeedbackConn {
     private static final String DRIVER = getValue("jdbc.driverClassName1");
@@ -137,7 +140,11 @@ public class PushFeedbackConn {
                     "values(?,?,?,?,to_date(?,'yyyy-mm-dd hh24:mi:ss'),?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
             state.setString(1, patientId);
             state.setString(2, visitId);
-            state.setString(3,feedbackHosVO.getQcresultDetailMsg());
+            if(feedbackHosVO.getOperationType().equals("4")){
+                state.setString(3,feedbackHosVO.getExplainInfo());
+            }else{
+                state.setString(3,feedbackHosVO.getQcresultDetailMsg());
+            }
             state.setString(4,"评价质控");
             state.setString(5, DateUtil.formatDateTime(DateUtil.now()));
             state.setString(6,Long.toString(feedbackHosVO.getId()));
@@ -291,11 +298,12 @@ public class PushFeedbackConn {
 
     public List<FeedbackHosVO> statusQuery(FeedbackHosVO feedbackHosVO){
         List<FeedbackHosVO> statusList= Lists.newLinkedList();
+        String ret="'"+feedbackHosVO.getIds().replace(",", "','")+"'";
         try {
             connection = getConnection();
             connection.setAutoCommit(false);//事物开始
             String sql =" select TOPIC_ID,MSG_STATUS from MEDICAL_QC_MSG ";
-            sql+=" where DETAILCODE in("+feedbackHosVO.getIds()+") or TOPIC_ID in("+ feedbackHosVO.getIds() +")";
+            sql+=" where DETAILCODE in("+ret+") or TOPIC_ID in("+ ret +")";
             rs =this.Query(sql, null);
             while(rs.next()){
                 FeedbackHosVO hosVO=new FeedbackHosVO();

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

@@ -671,7 +671,7 @@ 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"));//病人状态
-				behospitalInfo.setIsQcType(rs.getString("qc_type"));
+				behospitalInfo.setIsQcType(rs.getString("is_qc_type"));
 				behospitalInfo.setIsDaytime(rs.getString("IS_DAYTIME"));//是否日间病例,1:是，0:否
 				behospitalInfoList.add(behospitalInfo);
 			}

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -35,7 +35,7 @@
         <result column="in_state" property="inState"/>
         <result column="is_deleted" property="isDeleted"/>
         <result column="is_daytime" property="isDaytime"/>
-        <result column="qc_type" property="isQcType"/>
+        <result column="is_qc_type" property="isQcType"/>
         <result column="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>
         <result column="creator" property="creator"/>