东方新华凭证推送

医保局代码提交

mjava-dongfangxinhua/src/main/java/com/malk/dongfangxinhua/controller/DFXHController.java

@@ -176,7 +176,6 @@ public class DFXHController {
     @PostMapping(value = "test")
     McR test(String name, HttpServletRequest request) {
 
-//        payService.synProofStatus("FINST-ROC66JB1O4ZKOE4CFHSRT9BW2D0Y3PILRS1WL7MP");
 
         return McR.success();
     }

mjava-dongfangxinhua/src/main/java/com/malk/dongfangxinhua/service/Impl/PayServiceImpl.java

@@ -247,8 +247,8 @@ public class PayServiceImpl implements PayService {
 
 
     //配置客户的sqlist URL
-    private static final String SQLITE_URL ="jdbc:sqlite:D:/JavaSpace/fbi.dll";
-//    private static final String SQLITE_URL ="jdbc:sqlite:D:/FASTBI/FBI/fbi.dll";
+//    private static final String SQLITE_URL ="jdbc:sqlite:D:/JavaSpace/fbi.dll";
+    private static final String SQLITE_URL ="jdbc:sqlite:D:/FASTBI/FBI/fbi.dll";
     /**
      * 同步凭证状态
      * @param formInstId
@@ -270,20 +270,14 @@ public class PayServiceImpl implements PayService {
             String sql = "SELECT * FROM rest_drrecord WHERE instance_id ='" + formInstId + "' and status = 1 order by id desc";
             ResultSet rowsAffected = statement.executeQuery(sql);
 
-            log.info("rowsAffected:{}",rowsAffected);
-
             if (rowsAffected.next()) {
                 int status = rowsAffected.getInt("status");
                 String flag = rowsAffected.getString("flag");
-
-                log.info("flag:{}",flag);
-                log.info("status:{}",status);
-
                 if (status == 1){
                     // 更新付款申请单凭证状态
                     ydClient.operateData(YDParam.builder()
                             .formInstanceId(formInstId)
-                            .updateFormDataJson(JSON.toJSONString(UtilMap.map("textField_lof4wiqt, textField_lof4wiqr","凭证已生成",rowsAffected.getString("record_id"))))
+                            .updateFormDataJson(JSON.toJSONString(UtilMap.map("textField_lof4wiqt, textField_lof4wiqr","凭证已生成",flag)))
                             .build(), YDConf.FORM_OPERATION.update);
                     log.info("凭证已生成:{}",rowsAffected.getString("note"));
                 }

mjava-yibaoju/src/main/java/com/malk/yibaoju/controller/YBJController.java

@@ -2,6 +2,8 @@ package com.malk.yibaoju.controller;
 
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.malk.server.aliwork.YDConf;
 import com.malk.server.aliwork.YDParam;
 import com.malk.server.common.McException;

mjava-yibaoju/src/main/java/com/malk/yibaoju/service/impl/YBJServiceImpl.java

@@ -115,6 +115,9 @@ public class YBJServiceImpl implements YBJService {
                         hashMap.put("textField_lpgi8scj",map.get("textField_lo701pwy"));  //计划明细id
                         hashMap.put("textField_lq9llmhl",formMap.get("textField_lop4v4qx"));  //护理对象ID
 
+                        if (formMap.get("departmentSelectField_lxztlnnx_id")!=null){
+                            hashMap.put("departmentSelectField_lxzto1e1",String.valueOf(formMap.get("departmentSelectField_lxztlnnx_id")));  //部门
+                        }
                         try {
                             Thread.sleep(200);
                         } catch (InterruptedException e) {
@@ -212,7 +215,9 @@ public class YBJServiceImpl implements YBJService {
                         hashMap.put("employeeField_lo3pmoi6",JSON.parse(map.get("employeeField_lo3pmoi6_id").toString()));  //护理人员姓名-成员
                         hashMap.put("textField_lpgi8scj",map.get("textField_lo701pwy"));  //计划明细id
                         hashMap.put("textField_lq9llmhl",formMap.get("textField_lop4v4qx"));  //护理对象ID
-
+                        if (formMap.get("departmentSelectField_lxztlnnx_id")!=null){
+                            hashMap.put("departmentSelectField_lxzto1e1",String.valueOf(formMap.get("departmentSelectField_lxztlnnx_id")));  //部门
+                        }
                         try {
                             Thread.sleep(200);
                         } catch (InterruptedException e) {
@@ -221,9 +226,9 @@ public class YBJServiceImpl implements YBJService {
                         try {
                             ydClient.operateData(YDParam.builder()
                                     .formUuid("FORM-IY966L71PJ8FV10D61M1HBHU6FB320M2765OLM")
-                                    .searchCondition(JSON.toJSONString(UtilMap.map("dateField_lred6eoj, textField_lnyhv5tn, textField_lombve2g",Arrays.asList(UtilDateTime.parse( nextDay+ " 00:00:01","yyyy-MM-dd HH:mm:ss"),UtilDateTime.parse( nextDay+ " 23:59:59","yyyy-MM-dd HH:mm:ss")),formMap.get("textField_lnyhv5tn"),map.get("textField_lomchzi3"))))
+//                                    .searchCondition(JSON.toJSONString(UtilMap.map("dateField_lred6eoj, textField_lnyhv5tn, textField_lombve2g",Arrays.asList(UtilDateTime.parse( nextDay+ " 00:00:01","yyyy-MM-dd HH:mm:ss"),UtilDateTime.parse( nextDay+ " 23:59:59","yyyy-MM-dd HH:mm:ss")),formMap.get("textField_lnyhv5tn"),map.get("textField_lomchzi3"))))
                                     .formDataJson(JSON.toJSONString(hashMap))
-                                    .build(), YDConf.FORM_OPERATION.upsert);
+                                    .build(), YDConf.FORM_OPERATION.create);
                         } catch (Exception e) {
                             log.info("异常数据{}",hashMap);
                         }
@@ -317,42 +322,45 @@ public class YBJServiceImpl implements YBJService {
             List<Map> maps =  mapList.stream().filter(item -> item.get("selectField_lo3pmohy").equals(dayOfWeek.replace("星期","周"))).collect(Collectors.toList());
             for (Map map : maps) {
 
-                Map hashMap = new HashMap();
-                hashMap.put("associationFormField_lo3pmohz",JSON.parse(map.get("associationFormField_lo3pmohz_id").toString()));  //护理人员名称
-                hashMap.put("textField_lo3pmoi0",map.get("textField_lo3pmoi0"));  //护理人员所属机构
-                hashMap.put("textField_lombve2g",map.get("textField_lomchzi3"));  //护理人员身份证
-                hashMap.put("textField_lo3pmoi3",map.get("textField_lo3pmoi3"));  //护理人员手机号
-                hashMap.put("associationFormField_lo3pmohw",JSON.parse(formData.get("associationFormField_lo3pmohw_id").toString()));  //护理对象姓名
-                hashMap.put("textField_lnyhv5tn",formData.get("textField_lnyhv5tn")); //护理对象身份证
-                hashMap.put("selectField_lnyhv5tp",formData.get("selectField_lnyhv5tp"));  //护理对象等级
-                hashMap.put("textField_lnyhv5tr",formData.get("textField_lnyhv5tr"));  //护理对象住址
-                hashMap.put("selectField_lo3pmohy",dayOfWeek.replace("星期","周"));  //护理时间  （星期几）
-                hashMap.put("dateField_lred6eoj", UtilDateTime.parse(String.valueOf(nextDay)+" "+map.get("selectField_lr1uxpu3"),"yyyy-MM-dd HH:mm")); //护理开始时间。 用当前日期+护理计划的  时分    转成时间戳
-                hashMap.put("dateField_lred6eok",UtilDateTime.parse(String.valueOf(nextDay)+" "+map.get("selectField_lr1uxpu4"),"yyyy-MM-dd HH:mm")); //护理结束时间。 用当前日期+护理计划的  时分    转成时间戳
-                hashMap.put("selectField_lqcgsbw2","未执行");  //执行情况
-                hashMap.put("selectField_lo56u5fn","待上报");  //任务状态
-
-                hashMap.put("textField_lvae7q5n",formData.get("textField_lvae99fj")); //护理对象经度
-                hashMap.put("textField_lvae7q5o",formData.get("textField_lvae99fk"));  //护理对象纬度
-
-                hashMap.put("textField_lrx0r38x",String.valueOf(nextDay));  //护理日期-文本
-                hashMap.put("selectField_lr36z6hd","是");  //任务状态
-                hashMap.put("textField_lo55rupj",formData.get("textField_lo55rupj"));  //护理对象姓名-文本
-                hashMap.put("textField_lo3pmoi4",map.get("textField_lo3pmoi4"));  //护理证书类型
-                hashMap.put("employeeField_lo3pmoi6",map.get("employeeField_lo3pmoi6_id"));  //护理人员姓名-成员
-                hashMap.put("textField_lpgi8scj",map.get("textField_lo701pwy"));  //计划明细id
-                hashMap.put("textField_lq9llmhl",formData.get("textField_lop4v4qx"));  //护理对象ID
-
-
                 //通过护理时间  护理对象ID    证数据是否已经存在
                 YDParam ydParam1 = YDParam.builder()
                         .formUuid("FORM-IY966L71PJ8FV10D61M1HBHU6FB320M2765OLM")
                         .searchFieldJson(JSON.toJSONString(UtilMap.map("dateField_lred6eoj, textField_lnyhv5tn, textField_lombve2g",Arrays.asList(UtilDateTime.parse( nextDay+ " 00:00:01","yyyy-MM-dd HH:mm:ss"),UtilDateTime.parse( nextDay+ " 23:59:59","yyyy-MM-dd HH:mm:ss")),formData.get("textField_lnyhv5tn"),map.get("textField_lomchzi3"))))
                         .build();
                 List<Map> dataList = (List<Map>) ydClient.queryData(ydParam1, YDConf.FORM_QUERY.retrieve_search_form).getData();
+                //如果已存在数据  则不新增
+                if (1>dataList.size()){
+
+                    Map hashMap = new HashMap();
+                    hashMap.put("associationFormField_lo3pmohz",JSON.parse(map.get("associationFormField_lo3pmohz_id").toString()));  //护理人员名称
+                    hashMap.put("textField_lo3pmoi0",map.get("textField_lo3pmoi0"));  //护理人员所属机构
+                    hashMap.put("textField_lombve2g",map.get("textField_lomchzi3"));  //护理人员身份证
+                    hashMap.put("textField_lo3pmoi3",map.get("textField_lo3pmoi3"));  //护理人员手机号
+                    hashMap.put("associationFormField_lo3pmohw",JSON.parse(formData.get("associationFormField_lo3pmohw_id").toString()));  //护理对象姓名
+                    hashMap.put("textField_lnyhv5tn",formData.get("textField_lnyhv5tn")); //护理对象身份证
+                    hashMap.put("selectField_lnyhv5tp",formData.get("selectField_lnyhv5tp"));  //护理对象等级
+                    hashMap.put("textField_lnyhv5tr",formData.get("textField_lnyhv5tr"));  //护理对象住址
+                    hashMap.put("selectField_lo3pmohy",dayOfWeek.replace("星期","周"));  //护理时间  （星期几）
+                    hashMap.put("dateField_lred6eoj", UtilDateTime.parse(String.valueOf(nextDay)+" "+map.get("selectField_lr1uxpu3"),"yyyy-MM-dd HH:mm")); //护理开始时间。 用当前日期+护理计划的  时分    转成时间戳
+                    hashMap.put("dateField_lred6eok",UtilDateTime.parse(String.valueOf(nextDay)+" "+map.get("selectField_lr1uxpu4"),"yyyy-MM-dd HH:mm")); //护理结束时间。 用当前日期+护理计划的  时分    转成时间戳
+                    hashMap.put("selectField_lqcgsbw2","未执行");  //执行情况
+                    hashMap.put("selectField_lo56u5fn","待上报");  //任务状态
+
+                    hashMap.put("textField_lvae7q5n",formData.get("textField_lvae99fj")); //护理对象经度
+                    hashMap.put("textField_lvae7q5o",formData.get("textField_lvae99fk"));  //护理对象纬度
+
+                    hashMap.put("textField_lrx0r38x",String.valueOf(nextDay));  //护理日期-文本
+                    hashMap.put("selectField_lr36z6hd","是");  //任务状态
+                    hashMap.put("textField_lo55rupj",formData.get("textField_lo55rupj"));  //护理对象姓名-文本
+                    hashMap.put("textField_lo3pmoi4",map.get("textField_lo3pmoi4"));  //护理证书类型
+                    hashMap.put("employeeField_lo3pmoi6",map.get("employeeField_lo3pmoi6_id"));  //护理人员姓名-成员
+                    hashMap.put("textField_lpgi8scj",map.get("textField_lo701pwy"));  //计划明细id
+                    hashMap.put("textField_lq9llmhl",formData.get("textField_lop4v4qx"));  //护理对象ID
+
+                    if (formData.get("departmentSelectField_lxztlnnx_id")!=null){
+                        hashMap.put("departmentSelectField_lxzto1e1",String.valueOf(formData.get("departmentSelectField_lxztlnnx_id")));  //部门
+                    }
 
-                //判断是否存在
-                if (dataList.size()<1){
                     try {
                         ydClient.operateData(YDParam.builder()
                                 .formUuid("FORM-IY966L71PJ8FV10D61M1HBHU6FB320M2765OLM")
@@ -428,7 +436,9 @@ public class YBJServiceImpl implements YBJService {
                 hashMap.put("textField_lpgi8scj",map.get("textField_lo701pwy"));  //计划明细id
                 hashMap.put("textField_lq9llmhl",formData.get("textField_lop4v4qx"));  //护理对象ID
 
-
+                if (formData.get("departmentSelectField_lxztlnnx_id")!=null){
+                    hashMap.put("departmentSelectField_lxzto1e1",String.valueOf(formData.get("departmentSelectField_lxztlnnx_id")));  //部门
+                }
                 try {
                     ydClient.operateData(YDParam.builder()
                             .formUuid("FORM-IY966L71PJ8FV10D61M1HBHU6FB320M2765OLM")
@@ -476,68 +486,6 @@ public class YBJServiceImpl implements YBJService {
                     .build(), YDConf.FORM_OPERATION.delete);
         });
 
-
-//
-//        //获取当前日期是本月几号
-//        int dayOfMonth = currentDate.getDayOfMonth();
-//        //获取本月天数
-//        int daysInMonth = currentDate.lengthOfMonth();
-//            //重新创建计划任务
-//            for (int i = 0; i <=daysInMonth-dayOfMonth ; i++) {
-//                //获取是周几
-//                String dayOfWeek = currentDate.plusDays(i).getDayOfWeek().getDisplayName(TextStyle.FULL, new Locale("zh", "CN"));
-//                //获取循环每天的日期
-//                LocalDate nextDay = currentDate.plusDays(i);
-//                List<Map> maps =  mapList.stream().filter(item -> item.get("selectField_lo3pmohy").equals(dayOfWeek.replace("星期","周"))).collect(Collectors.toList());
-//                for (Map map : maps) {
-//                    Map hashMap = new HashMap();
-//                    hashMap.put("associationFormField_lo3pmohz",JSON.parse(map.get("associationFormField_lo3pmohz_id").toString()));  //护理人员名称
-//                    hashMap.put("textField_lo3pmoi0",map.get("textField_lo3pmoi0"));  //护理人员所属机构
-//                    hashMap.put("textField_lombve2g",map.get("textField_lomchzi3"));  //护理人员身份证
-//                    hashMap.put("textField_lo3pmoi3",map.get("textField_lo3pmoi3"));  //护理人员手机号
-//                    hashMap.put("associationFormField_lo3pmohw",JSON.parse(formData.get("associationFormField_lo3pmohw_id").toString()));  //护理对象姓名
-//                    hashMap.put("textField_lnyhv5tn",formData.get("textField_lnyhv5tn")); //护理对象身份证
-//                    hashMap.put("selectField_lnyhv5tp",formData.get("selectField_lnyhv5tp"));  //护理对象等级
-//                    hashMap.put("textField_lnyhv5tr",formData.get("textField_lnyhv5tr"));  //护理对象住址
-//                    hashMap.put("selectField_lo3pmohy",dayOfWeek.replace("星期","周"));  //护理时间  （星期几）
-//                    hashMap.put("dateField_lred6eoj", UtilDateTime.parse(String.valueOf(nextDay)+" "+map.get("selectField_lr1uxpu3"),"yyyy-MM-dd HH:mm")); //护理开始时间。 用当前日期+护理计划的  时分    转成时间戳
-//                    hashMap.put("dateField_lred6eok",UtilDateTime.parse(String.valueOf(nextDay)+" "+map.get("selectField_lr1uxpu4"),"yyyy-MM-dd HH:mm")); //护理结束时间。 用当前日期+护理计划的  时分    转成时间戳
-//                    hashMap.put("selectField_lqcgsbw2","未执行");  //执行情况
-//                    hashMap.put("selectField_lo56u5fn","待上报");  //任务状态
-//
-//                    hashMap.put("textField_lvae7q5n",formData.get("textField_lvae99fj")); //护理对象经度
-//                    hashMap.put("textField_lvae7q5o",formData.get("textField_lvae99fk"));  //护理对象纬度
-//
-//                    hashMap.put("textField_lrx0r38x",String.valueOf(nextDay));  //护理日期-文本
-//                    hashMap.put("selectField_lr36z6hd","是");  //任务状态
-//                    hashMap.put("textField_lo55rupj",formData.get("textField_lo55rupj"));  //护理对象姓名-文本
-//                    hashMap.put("textField_lo3pmoi4",map.get("textField_lo3pmoi4"));  //护理证书类型
-//                    hashMap.put("employeeField_lo3pmoi6",JSON.parse(map.get("employeeField_lo3pmoi6_id").toString()));  //护理人员姓名-成员
-//                    hashMap.put("textField_lpgi8scj",map.get("textField_lo701pwy"));  //计划明细id
-//                    hashMap.put("textField_lq9llmhl",formData.get("textField_lop4v4qx"));  //护理对象ID
-//
-//
-//                    //通过护理时间  护理对象ID    证数据是否已经存在
-//                    YDParam ydParam1 = YDParam.builder()
-//                            .formUuid("FORM-IY966L71PJ8FV10D61M1HBHU6FB320M2765OLM")
-//                            .searchFieldJson(JSON.toJSONString(UtilMap.map("dateField_lred6eoj, textField_lnyhv5tn, textField_lombve2g",Arrays.asList(UtilDateTime.parse( nextDay+ " 00:00:01","yyyy-MM-dd HH:mm:ss"),UtilDateTime.parse( nextDay+ " 23:59:59","yyyy-MM-dd HH:mm:ss")),formData.get("textField_lnyhv5tn"),map.get("textField_lomchzi3"))))
-//                            .build();
-//                    List<Map> dataList = (List<Map>) ydClient.queryData(ydParam1, YDConf.FORM_QUERY.retrieve_search_form).getData();
-//
-//                    //判断是否存在
-//                    if (dataList.size()<1){
-//                        try {
-//                            ydClient.operateData(YDParam.builder()
-//                                    .formUuid("FORM-IY966L71PJ8FV10D61M1HBHU6FB320M2765OLM")
-//                                    .formDataJson(JSON.toJSONString(hashMap))
-//                                    .build(), YDConf.FORM_OPERATION.create);
-//                        } catch (Exception e) {
-//                            log.info("定时任务创建计划失败：{}",e);
-//                        }
-//                    }
-//                }
-//            }
-
     }
 
     /**