上传问题

src/main/java/thyyxxk/webserver/entity/querydata/JieSuanDanChaXun.java

@@ -74,6 +74,10 @@ public class JieSuanDanChaXun {
      * 支付方式
      */
     private Integer hiPaymtd;
+    /**
+     * 上传截止时间倒数天数
+     */
+    private Integer uploadJieZhiDay;
 
     private List<SiSetlinfoTemp> siSetlinfoTemps;
 

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

@@ -154,8 +154,7 @@ public class SetlListUpldService {
         JSONObject jsonObject = exec.makeTradeHeaderWithInsureArea(SiFunction.UPLOAD_SI_SETTLE_INFO, upldCollection.getData().getSetlinfo().getInsuplc());
         jsonObject.replace("input", input);
         // 这里是上传
-        //JSONObject result = exec.executeTrade(jsonObject, SiFunction.UPLOAD_SI_SETTLE_INFO);
-        JSONObject result = null;
+        JSONObject result = exec.executeTrade(jsonObject, SiFunction.UPLOAD_SI_SETTLE_INFO);
 
         log.info("医保结算信息上传 \n操作人：{}\n参数：{} \n结果：{}", TokenUtil.getTokenUserId(), jsonObject, result);
         if (null == result) {
@@ -825,14 +824,15 @@ public class SetlListUpldService {
      */
     public ResultVo<IPage<SiSetlinfoTemp>> huoQuJieSuanRenYuan(JieSuanDanChaXun param) {
         IPage<SiSetlinfoTemp> page = new Page<>();
-        QueryWrapper<?> queryWrapper = statementQueryConditions(param);
+        //获取截上传截止天数,结算时间后截止几天到期
+        String dictValue = dao.getDictValueByDictName("1.1", "1");
+        QueryWrapper<?> queryWrapper = statementQueryConditions(param,dictValue);
         page.setRecords(dao.huoQuJieSuanRenYuan(queryWrapper,
                 param.getCurrentPage(), param.getPageSize()));
         if (ListUtil.isBlank(page.getRecords())) {
             return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
         }
-        //获取截上传截止天数,结算时间后截止几天到期
-        String dictValue = dao.getDictValueByDictName("1.1", "1");
+
         Set<String> inpatientNos = new HashSet<>();
         for (SiSetlinfoTemp item : page.getRecords()) {
             inpatientNos.add(item.getPatNo());
@@ -961,7 +961,7 @@ public class SetlListUpldService {
      * @param param 参数
      * @return 返回
      */
-    private QueryWrapper<?> statementQueryConditions(JieSuanDanChaXun param) {
+    private QueryWrapper<?> statementQueryConditions(JieSuanDanChaXun param,String day) {
         QueryWrapper<?> qw = new QueryWrapper<>();
         log.info("查询参数:{}", JSON.toJSONString(param));
         if (StringUtil.notBlank(param.getStartTime())) {
@@ -1020,6 +1020,12 @@ public class SetlListUpldService {
         if (StringUtil.notBlank(param.getReferPhysician())) {
             qw.eq("b.refer_physician", param.getReferPhysician());
         }
+        if (param.getUploadJieZhiDay() != null) {
+            Integer value = Integer.parseInt(day);
+            Integer result = value - param.getUploadJieZhiDay();
+            result = result==0?1:result;
+            qw.apply(" DATEDIFF(day,a.setl_time,GETDATE()) = {0}",result);
+        }
         return qw;
     }