优化结算单上传

src/main/java/thyyxxk/webserver/service/externalhttp/DrgWebServices.java

@@ -12,16 +12,16 @@ import thyyxxk.webserver.entity.vo.DrgGroupTestVO;
  */
 public interface DrgWebServices {
 
-    @Post(url = "http://172.16.32.126:8080/drg_web/localHelp/drg_dagns/list.action")
+    @Post(url = "http://172.16.32.126:8080/drg_web/localHelp/drg_dagns/list.action", connectTimeout = 3000, readTimeout = 6000)
     String localHelpDrgDagns(@JSONBody DrgGroupTestVO drgGroupTestVO);
 
-    @Post(url = "http://172.16.32.126:8080/drg_web/drgGroupThird/V2/setListDrg.action")
+    @Post(url = "http://172.16.32.126:8080/drg_web/drgGroupThird/V2/setListDrg.action", connectTimeout = 3000, readTimeout = 6000)
     JSONObject drgQuality(@JSONBody JSONObject obj);
 
-    @Post(url = "http://172.16.32.126:8082/etlClient/callHisData.action", async = true)
+    @Post(url = "http://172.16.32.126:8082/etlClient/callHisData.action", async = true, connectTimeout = 3000, readTimeout = 6000)
     void etlClient(@JSONBody JSONObject obj);
 
-    @Post(url = "http://172.16.32.126:8080/drg_web/drgGroupThird/getAllDrgResults.action")
+    @Post(url = "http://172.16.32.126:8080/drg_web/drgGroupThird/getAllDrgResults.action", connectTimeout = 3000, readTimeout = 6000)
     JSONObject getDrgCaseQualityControlGroup(@JSONBody JSONObject obj);
 
 }

src/main/java/thyyxxk/webserver/service/medicalinsurance/SetlListUpldService.java

@@ -238,7 +238,7 @@ public class SetlListUpldService {
     public void dealDrgGroup(String patNo, Integer times, Integer ledgerSn, SetlinfoUpld setlinfo) {
         SiLog siLog = null;
         try {
-            Integer flag = getModifyFlag(patNo, times);
+            int flag = getModifyFlag(patNo, times);
             List<YbZyDisDiag> ybZyDisDiags = dao.zhenDuanXinXi(patNo, times, flag == 1 ? "zy_dis_diag_yb_modify" : "zy_dis_diag_yb");
             List<BatjBa4> batjBa4s = dao.shouShuXinXi(patNo, times, flag == 1 ? "batj_ba4_modify" : "batj_ba4");
             ZyInactpatient param = new ZyInactpatient();
@@ -589,9 +589,7 @@ public class SetlListUpldService {
         return ybCode;
     }
 
-
-    @NotNull
-    public Integer getModifyFlag(String patNo, Integer times) {
+    public int getModifyFlag(String patNo, Integer times) {
         TYbSetlModifyReq setlModifyReq = dao.getSetlModifyReq(patNo, times);
         Integer flag = setlModifyReq != null ? setlModifyReq.getAuditFlag() : null;
         String reRemark = setlModifyReq != null ? setlModifyReq.getReqRemark() : null;
@@ -705,7 +703,7 @@ public class SetlListUpldService {
      */
     public ResultVo<UpldCollectionTemp> daYingShangChuanJieSuanDan(String patNo, Integer times, Integer ledgerSn) throws
             Exception {
-        Integer flag = getModifyFlag(patNo, times);
+        int flag = getModifyFlag(patNo, times);
         // 查询出来的信息
         ResultVo<UpldCollection> uploadInfo = getUploadInfo(patNo, times, ledgerSn);
         if (!uploadInfo.getCode().equals(ExceptionEnum.SUCCESS.getCode())) {
@@ -876,10 +874,10 @@ public class SetlListUpldService {
             }
         } catch (Exception e) {
             log.error("结算单重新上传错误", e);
-            autoUploadBill.setLogText(e.getMessage());
+            autoUploadBill.setLogText(e.getCause().getMessage());
             autoUploadBill.setFlag(AutoUploadBill.FLAG.UPLOAD_FAIL.getCode());
             if (sendMessageFlag) {
-                upldSetlErrorMessage(siPatInfo.getPatNo(), siPatInfo.getTimes(), siPatInfo.getLedgerSn(), e.getMessage(), 2, index, size, siPatInfo.getOutDeptName(), siPatInfo.getPsnName(), siPatInfo.getReferPhysicianName());
+                upldSetlErrorMessage(siPatInfo.getPatNo(), siPatInfo.getTimes(), siPatInfo.getLedgerSn(), e.getCause().getMessage(), 2, index, size, siPatInfo.getOutDeptName(), siPatInfo.getPsnName(), siPatInfo.getReferPhysicianName());
             }
         }
         return autoUploadBill;
@@ -887,12 +885,12 @@ public class SetlListUpldService {
 
     public boolean isCheckFlag() {
         String checkUploadFlag = dao.getDictValueByDictName("1.3", "check_upload_flag");
-        return "1".equals(checkUploadFlag) ? true : false;
+        return "1".equals(checkUploadFlag);
     }
 
     public boolean isCheckAuditFlag() {
         String checkUploadFlag = dao.getDictValueByDictName("1.4", "check_audit_flag");
-        return "1".equals(checkUploadFlag) ? true : false;
+        return "1".equals(checkUploadFlag);
     }
 
     /**