1、缺陷反馈调整；

2、补录调整

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

@@ -25,6 +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`;
 
 
 /**

src/main/java/com/diagbot/entity/BehospitalInfo.java

@@ -168,6 +168,11 @@ public class BehospitalInfo implements Serializable {
      */
     private String isDaytime;
 
+    /**
+     * 是否质控 0:是 1:否（质控规则 24小时内出院，无医嘱，费用为0）
+     */
+    private String isQcType;
+
     /**
      * 是否删除,N:未删除，Y:删除
      */
@@ -449,6 +454,22 @@ public class BehospitalInfo implements Serializable {
         this.modifier = modifier;
     }
 
+    public String getIsDaytime() {
+        return isDaytime;
+    }
+
+    public void setIsDaytime(String isDaytime) {
+        this.isDaytime = isDaytime;
+    }
+
+    public String getIsQcType() {
+        return isQcType;
+    }
+
+    public void setIsQcType(String isQcType) {
+        this.isQcType = isQcType;
+    }
+
     @Override
     public String toString() {
         return "MedBehospitalInfo{" +

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

@@ -427,6 +427,10 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                                 qcTypeId = initQcTypeId(behospitalInfo);
                             }
                             behospitalInfo.setQcTypeId(qcTypeId);
+                            if(behospitalInfo.getIsQcType().equals("1")){
+                                //-是否质控 0:是 1:否   （质控规则 24小时内出院，无医嘱，费用为0）
+                                behospitalInfo.setQcTypeId(0L);
+                            }
                             behospitalInfoList.add(behospitalInfo);
                         }
                     }

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

@@ -299,7 +299,7 @@ public class PushFeedbackConn {
             rs =this.Query(sql, null);
             while(rs.next()){
                 FeedbackHosVO hosVO=new FeedbackHosVO();
-                hosVO.setId(Long.valueOf(rs.getString("TOPIC_ID")));
+                hosVO.setId(Long.parseLong(rs.getString("TOPIC_ID")));
                 hosVO.setMsgStatus(rs.getString("MSG_STATUS"));
 
                 statusList.add(hosVO);

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

@@ -671,11 +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"));//病人状态
-				if(StringUtil.isNotEmpty(rs.getString("qc_type")) && rs.getString("qc_type").equals("1")){
-					//-是否质控 0:是 1:否   （质控规则 24小时内出院，无医嘱，费用为0）
-					behospitalInfo.setQcTypeId(0L);
-				}
-
+				behospitalInfo.setIsQcType(rs.getString("qc_type"));
 				behospitalInfo.setIsDaytime(rs.getString("IS_DAYTIME"));//是否日间病例,1:是，0:否
 				behospitalInfoList.add(behospitalInfo);
 			}

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -35,6 +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="gmt_create" property="gmtCreate"/>
         <result column="gmt_modified" property="gmtModified"/>
         <result column="creator" property="creator"/>