优化终审查询

src/main/java/com/emr/controller/MedicalRecallController.java

@@ -165,7 +165,7 @@ public class MedicalRecallController {
                         archive_master_followingService.insertSelective(archiveMasterFollowing);
                     }else{
                         //留观号召回推送第三方
-                        archiveMasterService.requestObservationRecord(inpatientNo,"RETURNED",emrFaultDetail.getRecallReason());
+                        archiveMasterService.requestObservationRecord(inpatientNo,"RETURNED",emrFaultDetail.getRecallReason(),null);
                     }
                     result="召回成功!";
                 }

src/main/java/com/emr/controller/lastVerifyController.java

@@ -208,7 +208,7 @@ public class lastVerifyController {
                 }
                 if("LG".equals(lgFlag)) {
                     //留观号审核推送第三方
-                    archiveMasterService.requestObservationRecord(inpatientNo, "RETURNED", emrFaultDetail.getBackContent());
+                    archiveMasterService.requestObservationRecord(inpatientNo, "RETURNED",null,list);
                 }
             }else{
                 bol=2;
@@ -286,7 +286,7 @@ public class lastVerifyController {
             String lgFlag = inpatientNo.substring(0,2);
             if("LG".equals(lgFlag)) {
                 //留观号审核推送第三方
-                archiveMasterService.requestObservationRecord(inpatientNo,"AUDITED",null);
+                archiveMasterService.requestObservationRecord(inpatientNo,"AUDITED",null,null);
             }
         }
         return Msg.success();

src/main/java/com/emr/service/Archive_MasterService.java

@@ -235,7 +235,7 @@ public interface Archive_MasterService {
      * */
     List<Archive_Master>  selectByObject(String patientId,String visitId);
 
-    void requestObservationRecord(String inpatientNo, String status,String reason);
+    void requestObservationRecord(String inpatientNo, String status,String reason,List<Emr_Fault_Detail> list);
 
     /**
      * 根据条件查找'归档中','主任复审退回'病案列表

src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java

@@ -616,7 +616,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
     }
 
     @Override
-    public void requestObservationRecord(String inpatientNo, String status,String reason) {
+    public void requestObservationRecord(String inpatientNo, String status,String reason,List<Emr_Fault_Detail> list) {
         //留观推送第三方 http://10.162.0.51:8091/sanshuyun-ems-function/file/away/updateStatus
         Map<String,String> params = new HashMap<>();
         //留观号
@@ -625,6 +625,25 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         params.put("status",status);
         if (StringUtils.isNotBlank(reason)) {
             params.put("reason",reason);
+        }else {
+            //获取打回原因
+            StringBuilder returnContent = new StringBuilder();
+            if (!CollectionUtils.isEmpty(list)) {
+                for (Emr_Fault_Detail obj : list) {
+                    if (StringUtils.isNotBlank(returnContent)) {
+                        returnContent.append(",");
+                    }
+                    returnContent.append(obj.getBackContent());
+                    String content = obj.getContent();
+                    if (StringUtils.isBlank(content)) {
+                        content = "无";
+                    }
+                    returnContent.append(":").append(content);
+                }
+                if (StringUtils.isNotBlank(returnContent)) {
+                    params.put("reason", returnContent.toString());
+                }
+            }
         }
         try {
             HttpClientTool.doPost(observationRecordRequestUrl,params);
@@ -662,21 +681,6 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         //获取退回标识，0打回首页；1打回医生；2打回护士
         String returnFlag = emrFaultDetail.getDealFlag();
         if(StringUtils.isNotBlank(returnFlag)) {
-            //获取打回原因
-            StringBuilder returnContent = new StringBuilder();
-            if(!CollectionUtils.isEmpty(list)){
-                for(Emr_Fault_Detail obj : list){
-                    if(StringUtils.isNotBlank(returnContent)){
-                        returnContent.append(",");
-                    }
-                    returnContent.append(obj.getBackContent());
-                    String content = obj.getContent();
-                    if(StringUtils.isBlank(content)){
-                        content = "无";
-                    }
-                    returnContent.append(":").append(content);
-                }
-            }
             //组织打回参数值
             /*{
                 "INP_NO": "1356601",

src/main/resources/config/jdbc.properties

@@ -1,9 +1,9 @@
-POWER_IP=10.6.1.127
+POWER_IP=localhost
 jdbc.username=sa
 jdbc.password=docus@702
-dataBaseName=DB_PrivilegeManagement_GYFY
+dataBaseName=zj_record_new
 POWER_PORT=8080
-jdbc.url=jdbc\:sqlserver\://${POWER_IP}:1433;databaseName=${dataBaseName}
+jdbc.url=jdbc\:sqlserver\://120.27.212.36:1433;databaseName=${dataBaseName}
 
 jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 #hibernate config

src/main/webapp/WEB-INF/views/pdfDir/pdfLastDir.jsp

@@ -1163,7 +1163,7 @@
                                     });
 
                                 } else {
-                                    toastr.warning("病案室已经退回!");
+                                    backUpdate();
                                     //刷新
                                     $('#table').bootstrapTable('refresh');
                                 }
@@ -1194,6 +1194,10 @@
             //     toastr.warning("评分范围0-100!");
             //     return;
             // }
+            backUpdate();
+        });
+
+        function backUpdate(){
             if (archiveDetailId != null && archiveDetailId != "") {
                 var data = {};
                 data.archiveDetailId = archiveDetailId;
@@ -1215,7 +1219,7 @@
                 //     data.checkID[i] =$(this).val();
                 //     console.log(data.checkID);
                 // })
-              //  debugger
+                //  debugger
                 //根据病案号保存缺陷信息
                 $.ajax({
                     url: "${path}/lastVerify/updateDetailByArchivId",
@@ -1224,7 +1228,7 @@
                     success: function (result) {
                         if (result == '1') {
                             //关闭modal
-                           $('#lastBackModal').modal('hide');  //手动关闭
+                            $('#lastBackModal').modal('hide');  //手动关闭
                             //$('#firstModal').modal('hide');  //手动关闭
                             toastr.success("退回成功!");
                             //刷新
@@ -1265,9 +1269,7 @@
             } else {
                 toastr.warning("病案号不存在!");
             }
-        });
-
-
+        }
 
 
         $("#addBtn").click(function () {