Merge branch 'master' of https://172.16.32.165/lighter/web-server

src/main/java/thyyxxk/webserver/dao/his/medicalinsurance/UpIdCollectionDao.java

@@ -51,7 +51,9 @@ public interface UpIdCollectionDao {
             "       a.setl_time as  setl_end_date " +  //结算时间
             "from t_si_setlinfo a, t_si_pat_info b " +
             "where a.pat_no=b.pat_no and a.times=b.times " +
+            "and a.ledger_sn = b.ledger_sn  " +
             "and a.pat_no = #{patNo} and a.times = #{times} " +
+            "and a.ledger_sn = #{ledgerSn} " +
             "and a.revoked = 0 ")
     SetlinfoUpld setlinfo1(@Param("patNo") String patNo,
                            @Param("times") Integer times,

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

@@ -131,7 +131,11 @@ public class SetlListUpldService {
             dao.fanHuiLiuShuiHao(result.getJSONObject(OUTPUT).getString("setl_list_id"), upldCollection.getData().getSetlinfo().getSetlId());
             return ResultVoUtil.success(ExceptionEnum.SUCCESS, "上传成功");
         }
-        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("医保中心报错：【%s】 ", result.getString("err_msg")));
+        String errMsg = result.getString("err_msg");
+        if (errMsg.length() > 9999) {
+            errMsg = "字符超长自动截取" + errMsg.substring(0, 9999);
+        }
+        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, String.format("医保中心报错的：【%s】 ", errMsg));
     }
 
     /**