1、缺陷反馈调整

src/main/java/com/diagbot/facade/supple/SupplementFacade.java

@@ -136,12 +136,12 @@ public class SupplementFacade {
             if (medicalRecordList.size() > 0) {
                 aMedicalRecordFacade.execute(medicalRecordList);
                 medicalRecordList.forEach(s -> {
-                    //获取文书详情
+                    /*//获取文书详情
                     String recId = s.getRecId();
                     //截取rec_id後面的_次數跟接口相對潁上
                     int inedx = s.getRecId().lastIndexOf("_");
-                    s.setRecId(s.getRecId().substring(0, inedx));
-                    viewFacade.getRecordContent(recId);
+                    s.setRecId(s.getRecId().substring(0, inedx));*/
+                    viewFacade.getRecordContent(s.getRecId());
                 });
             }
         }catch (Exception e){

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

@@ -133,7 +133,7 @@ public class PushFeedbackConn {
             connection = getConnection();
             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,EXPLAIN_INFO,POINT,DETAIL_CODE" +
+                    "(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)"+
                     "values(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)");
             state.setString(1, patientId);
@@ -203,7 +203,7 @@ public class PushFeedbackConn {
             connection = getConnection();
             connection.setAutoCommit(false);//事物开始
             String sql ="delete from MEDICAL_QC_MSG ";
-            sql+=" where PATIENT_ID = '"+patientId+"' and VISIT_ID = '"+visitId+"' and DETAIL_CODE='"+feedbackHosVO.getId()+"'";
+            sql+=" where PATIENT_ID = '"+patientId+"' and VISIT_ID = '"+visitId+"' and DETAILCODE='"+feedbackHosVO.getId()+"'";
             PreparedStatement state=connection.prepareStatement(sql);
             re = state.executeUpdate();
             if(re < 0){               //删除失败
@@ -237,10 +237,10 @@ public class PushFeedbackConn {
             connection = getConnection();
             connection.setAutoCommit(false);//事物开始
             String sql =" update MEDICAL_QC_MSG set " +
-                    " MESSAGE=?,ISSUED_BY=?,ISSUED_DATE_TIME=?,TOPIC_ID=?,DEPT_STAYED=?,MSG_STATUS=?,EXPLAIN_INFO=?," +
+                    " 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=?";
-            sql+=" where PATIENT_ID = ? and VISIT_ID = ? and DETAIL_CODE=?";
+            sql+=" where PATIENT_ID = ? and VISIT_ID = ? and DETAILCODE=?";
             PreparedStatement state=connection.prepareStatement(sql);
             state.setString(1,feedbackHosVO.getQcresultDetailMsg());
             state.setString(2,"评价质控");
@@ -299,12 +299,12 @@ public class PushFeedbackConn {
         try {
             connection = getConnection();
             connection.setAutoCommit(false);//事物开始
-            String sql =" select DETAIL_CODE,MSG_STATUS from MEDICAL_QC_MSG ";
-            sql+=" where DETAIL_CODE in("+feedbackHosVO.getIds()+")";
+            String sql =" select DETAILCODE,MSG_STATUS from MEDICAL_QC_MSG ";
+            sql+=" where DETAILCODE in("+feedbackHosVO.getIds()+")";
             rs =this.Query(sql, null);
             while(rs.next()){
                 FeedbackHosVO hosVO=new FeedbackHosVO();
-                hosVO.setId(Long.valueOf(rs.getString("DETAIL_CODE")));
+                hosVO.setId(Long.valueOf(rs.getString("DETAILCODE")));
                 hosVO.setMsgStatus(rs.getString("MSG_STATUS"));
 
                 statusList.add(hosVO);
@@ -325,7 +325,7 @@ public class PushFeedbackConn {
         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()+"'";
+            String sql =" select count(*) from MEDICAL_QC_MSG where PATIENT_ID = '"+patientId+"' and VISIT_ID = '"+visitId+"' and DETAILCODE='"+feedbackHosVO.getCasesEntryId()+"'";
             rs =this.Query(sql, null);
             if(rs.next()){
                 count=rs.getInt(1);

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

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

src/main/resources/jdbc.properties

@@ -19,7 +19,6 @@ jdbc.password1=langtong
 #jdbc.username1=langtong
 #jdbc.password1=langtong
 
-
 #jdbc.driverClassName=oracle.jdbc.OracleDriver
 #jdbc.url=jdbc:oracle:thin:@132.147.254.166:1521/orcl166
 #jdbc.username=ihd
@@ -35,11 +34,6 @@ jdbc.password1=langtong
 #jdbc.username1=langtong
 #jdbc.password1=langtong
 
-jdbc.driverClassName1=com.mysql.cj.jdbc.Driver
-jdbc.url1=jdbc:mysql://192.168.2.126:3307/xy_st?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
-jdbc.username1=root
-jdbc.password1=Lat0ne@tesT
-
 #\u6570\u636e\u670d\u52a1\u6a21\u5f0f
 remote.address.ver=http://192.18.101.207:2030/index.html
 remote.address.hor=http://192.18.101.207:2030/indexHorizontal.html