1、缺陷反馈调整；

2、补录调整

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

@@ -536,7 +536,7 @@ public class ViewFacade {
                     //截取rec_id後面的_次數跟接口相對潁上
                     int inedx = s.getRecId().lastIndexOf("_");
                     s.setRecId(s.getRecId().substring(0, inedx));
-                    this.getRecordContent(s.getRecId());
+                    this.getRecordContent(recId);
                 });
             }
             aMedicalRecordFacade.execute(medicalRecordList);

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

@@ -134,14 +134,14 @@ 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,DOCTOR_IN_CHARGE)"+
-                    "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
+                    ",CCIDS,POINT_TYPE,SENDER_DOCTOR,DOCTOR_IN_CHARGE_ID,APPLY_ENV,QA_EVENT_TYPE,QC_MSG_CODE,DOCTOR_IN_CHARGE,TOPIC)"+
+                    "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
             state.setString(1, patientId);
             state.setString(2, visitId);
             state.setString(3,feedbackHosVO.getQcresultDetailMsg());
             state.setString(4,"评价质控");
-            state.setDate(5, Date.valueOf(DateUtil.getCurrentDateStr("")));
-            state.setString(6,feedbackHosVO.getModeName());
+            state.setDate(5, Date.valueOf(DateUtil.getCurrentDateStr("yyyy-MM-dd")));
+            state.setString(6,Long.toString(feedbackHosVO.getModeId()));
             state.setString(7,feedbackHosVO.getDeptId());
             state.setInt(8,0);
             state.setString(9,feedbackHosVO.getExplainInfo());//缺陷说明
@@ -172,6 +172,7 @@ public class PushFeedbackConn {
             state.setString(17,operationType);
             state.setString(18,Long.toString(feedbackHosVO.getModeId()));
             state.setString(19,feedbackHosVO.getReceiverName());//接收人姓名
+            state.setString(20,feedbackHosVO.getModeName().trim());
             re = state.executeUpdate();
             if(re < 0){               //插入失败
                 connection.rollback();      //回滚
@@ -194,7 +195,7 @@ public class PushFeedbackConn {
 
     public static void main(String[] args) {
         BigDecimal number = new BigDecimal(12.22);
-        System.out.println(number.intValue());
+        System.out.println(Date.valueOf(DateUtil.getCurrentDateStr("yyyy-MM-dd")));
     }
 
     /**
@@ -245,13 +246,13 @@ 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=?,DOCTOR_IN_CHARGE=?";
+                    " APPLY_ENV=?,QA_EVENT_TYPE=?,QC_MSG_CODE=?,DOCTOR_IN_CHARGE=?,TOPIC=?";
             sql+=" where PATIENT_ID = ? and VISIT_ID = ? and DETAILCODE=?";
             PreparedStatement state=connection.prepareStatement(sql);
             state.setString(1,feedbackHosVO.getQcresultDetailMsg());
             state.setString(2,"评价质控");
-            state.setDate(3, Date.valueOf(DateUtil.getCurrentDateStr("")));
-            state.setString(4,feedbackHosVO.getModeName());
+            state.setDate(3, Date.valueOf(DateUtil.getCurrentDateStr("yyyy-MM-dd")));
+            state.setString(4,Long.toString(feedbackHosVO.getModeId()));
             state.setString(5,feedbackHosVO.getDeptId());
             state.setInt(6,0);
             state.setString(7,feedbackHosVO.getExplainInfo());//缺陷说明
@@ -278,9 +279,10 @@ public class PushFeedbackConn {
             state.setString(14,operationType);
             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()));//缺陷编号
+            state.setString(17,feedbackHosVO.getModeName().trim());
+            state.setString(18, patientId);
+            state.setString(19, visitId);
+            state.setString(20,Long.toString(feedbackHosVO.getCasesEntryId()));//缺陷编号
 
             re = state.executeUpdate();
             if(re < 0){               //修改失败

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

@@ -698,11 +698,7 @@ public class TZDBConn {
 			ResultSet rs =dbconn.Query(sql, null);
 			while(rs.next()){
                 MedicalRecord medicalRecord=new MedicalRecord();
-				String recId=rs.getString("recId");
-                if(StringUtil.isNotEmpty(recId)){
-					medicalRecord.setRecId(recId.substring(0,recId.lastIndexOf("_")));//文书序号
-				}
-
+				medicalRecord.setRecId(rs.getString("recId"));//文书序号
                 medicalRecord.setHospitalId(HOSPITAL_ID);//医院ID
                 medicalRecord.setBehospitalCode(rs.getString("behospitalCode")+"_"+rs.getString("behospitalNum"));//病人住院ID
                 medicalRecord.setOrgCode(rs.getString("orgCode"));//组织机构代码