|
@@ -35,7 +35,6 @@ public class YBJController {
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private YBJService ybjService;
|
|
private YBJService ybjService;
|
|
-
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private YDClient ydClient;
|
|
private YDClient ydClient;
|
|
|
|
|
|
@@ -49,8 +48,10 @@ public class YBJController {
|
|
return McR.success(ydClient.convertTemporaryUrl(UtilMap.getString(data, "url")));
|
|
return McR.success(ydClient.convertTemporaryUrl(UtilMap.getString(data, "url")));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+
|
|
/**
|
|
/**
|
|
- * 根据创建的护理计划生成本月多条护理数据
|
|
|
|
|
|
+ * 根据护理安排创建护理计划
|
|
|
|
+ * 通过参数 1个护理安排创建多条护理计划
|
|
*/
|
|
*/
|
|
@SneakyThrows
|
|
@SneakyThrows
|
|
@PostMapping("createPlan")
|
|
@PostMapping("createPlan")
|
|
@@ -58,11 +59,9 @@ public class YBJController {
|
|
|
|
|
|
Map data = UtilServlet.getParamMap(request);
|
|
Map data = UtilServlet.getParamMap(request);
|
|
log.info("createPlan 护理计划{}",data);
|
|
log.info("createPlan 护理计划{}",data);
|
|
-
|
|
|
|
LocalDate currentDate = LocalDate.now();
|
|
LocalDate currentDate = LocalDate.now();
|
|
//获取当前日期是本月几号
|
|
//获取当前日期是本月几号
|
|
int dayOfMonth = currentDate.getDayOfMonth();
|
|
int dayOfMonth = currentDate.getDayOfMonth();
|
|
-
|
|
|
|
if ("1".equals(data.get("status"))){
|
|
if ("1".equals(data.get("status"))){
|
|
ybjService.creatInfo(data.get("formInstId").toString());
|
|
ybjService.creatInfo(data.get("formInstId").toString());
|
|
//删除睡眠两秒 在执行创建
|
|
//删除睡眠两秒 在执行创建
|
|
@@ -80,10 +79,33 @@ public class YBJController {
|
|
return McR.success();
|
|
return McR.success();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 通过安排创建本月所有的护理计划
|
|
|
|
+ * @param request
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ @PostMapping("syncCreatePlan")
|
|
|
|
+ McR syncCreatePlan(HttpServletRequest request) {
|
|
|
|
+ ybjService.syncNursePlan();
|
|
|
|
+ return McR.success();
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 通过安排创建下月所有的护理计划
|
|
|
|
+ * @param request
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ @PostMapping("syncCreateNextPlan")
|
|
|
|
+ McR syncCreateNextPlan(HttpServletRequest request) {
|
|
|
|
+ ybjService.syncCreatePlan();
|
|
|
|
+ return McR.success();
|
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
/**
|
|
- * 暂停/恢复护理对象 删除/创建护理计划
|
|
|
|
|
|
+ * 暂停护理对象 删除所有未执行的护理计划
|
|
|
|
+ * 恢复护理对象 新增所有护理任务 如果当前日期是25日 则需要生成下月的数据
|
|
|
|
+ * 如果当前日期小于25日 则只生成本月的数据
|
|
* @param request
|
|
* @param request
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@@ -93,11 +115,9 @@ public class YBJController {
|
|
|
|
|
|
Map data = UtilServlet.getParamMap(request);
|
|
Map data = UtilServlet.getParamMap(request);
|
|
log.info("deletePlan 暂停/恢复护理对象 删除/创建护理计划{}",data);
|
|
log.info("deletePlan 暂停/恢复护理对象 删除/创建护理计划{}",data);
|
|
-
|
|
|
|
LocalDate currentDate = LocalDate.now();
|
|
LocalDate currentDate = LocalDate.now();
|
|
//获取当前日期是本月几号
|
|
//获取当前日期是本月几号
|
|
int dayOfMonth = currentDate.getDayOfMonth();
|
|
int dayOfMonth = currentDate.getDayOfMonth();
|
|
-
|
|
|
|
if ("1".equals(data.get("code"))){
|
|
if ("1".equals(data.get("code"))){
|
|
//获取护理对象CID
|
|
//获取护理对象CID
|
|
ybjService.deletePlan(data.get("cId").toString());
|
|
ybjService.deletePlan(data.get("cId").toString());
|
|
@@ -115,12 +135,10 @@ public class YBJController {
|
|
Thread.sleep(2000);
|
|
Thread.sleep(2000);
|
|
ybjService.creatNextInfo(map.get("formInstanceId").toString());
|
|
ybjService.creatNextInfo(map.get("formInstanceId").toString());
|
|
}
|
|
}
|
|
-
|
|
|
|
Thread.sleep(2000);
|
|
Thread.sleep(2000);
|
|
ybjService.creatNextInfo(map.get("formInstanceId").toString());
|
|
ybjService.creatNextInfo(map.get("formInstanceId").toString());
|
|
}
|
|
}
|
|
}else{ //编辑护理对象信息
|
|
}else{ //编辑护理对象信息
|
|
-
|
|
|
|
//先删除
|
|
//先删除
|
|
ybjService.deletePlan(data.get("cId").toString());
|
|
ybjService.deletePlan(data.get("cId").toString());
|
|
//删除睡眠两秒 在执行创建
|
|
//删除睡眠两秒 在执行创建
|
|
@@ -135,42 +153,35 @@ public class YBJController {
|
|
if(dataList.size()>0){
|
|
if(dataList.size()>0){
|
|
Map map = (Map) dataList.get(0);
|
|
Map map = (Map) dataList.get(0);
|
|
ybjService.creatInfo(map.get("formInstanceId").toString());
|
|
ybjService.creatInfo(map.get("formInstanceId").toString());
|
|
-
|
|
|
|
if (dayOfMonth>24){
|
|
if (dayOfMonth>24){
|
|
Thread.sleep(2000);
|
|
Thread.sleep(2000);
|
|
ybjService.creatNextInfo(map.get("formInstanceId").toString());
|
|
ybjService.creatNextInfo(map.get("formInstanceId").toString());
|
|
}
|
|
}
|
|
-
|
|
|
|
}
|
|
}
|
|
-
|
|
|
|
}
|
|
}
|
|
return McR.success();
|
|
return McR.success();
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private YDService ydService;
|
|
private YDService ydService;
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 更新子表关联表单 fixme 1.28 子表单关联表单更新
|
|
* 更新子表关联表单 fixme 1.28 子表单关联表单更新
|
|
|
|
+ *
|
|
|
|
+ * 更新护理安排中的成员组件信息
|
|
*/
|
|
*/
|
|
@GetMapping("update")
|
|
@GetMapping("update")
|
|
McR update() {
|
|
McR update() {
|
|
|
|
|
|
List<Map> dataList = ydService.queryFormData_all(YDParam.builder()
|
|
List<Map> dataList = ydService.queryFormData_all(YDParam.builder()
|
|
.formUuid("FORM-RK966E7105DFD27FA7EQHAOH9IFS2RN6MP3OL2")
|
|
.formUuid("FORM-RK966E7105DFD27FA7EQHAOH9IFS2RN6MP3OL2")
|
|
-// .searchFieldJson(JSON.toJSONString(UtilMap.map("textField_lnyhv5tn", "310226193301123225")))
|
|
|
|
.build());
|
|
.build());
|
|
-
|
|
|
|
for (Map formData: dataList) {
|
|
for (Map formData: dataList) {
|
|
-
|
|
|
|
List<Map> details = (List<Map>) formData.get("tableField_lo3pmohx");
|
|
List<Map> details = (List<Map>) formData.get("tableField_lo3pmohx");
|
|
for (Map row: details) {
|
|
for (Map row: details) {
|
|
row.put("employeeField_lo3pmoi6", "employeeField_lo3pmoi6_id");
|
|
row.put("employeeField_lo3pmoi6", "employeeField_lo3pmoi6_id");
|
|
row.put("associationFormField_lo3pmohz", YDConf.associationForm("APP_YIDJ71B8QORD2YHNZ26Q", "FORM-RK966E7105DFD27FA7EQHAOH9IFS2RN6MP3OL2" ,UtilMap.getString(row,"textField_lrvtfzng"), UtilMap.getString(row, "textField_lrvtfznf"), "", false));
|
|
row.put("associationFormField_lo3pmohz", YDConf.associationForm("APP_YIDJ71B8QORD2YHNZ26Q", "FORM-RK966E7105DFD27FA7EQHAOH9IFS2RN6MP3OL2" ,UtilMap.getString(row,"textField_lrvtfzng"), UtilMap.getString(row, "textField_lrvtfznf"), "", false));
|
|
}
|
|
}
|
|
formData.put("tableField_lo3pmohx", details);
|
|
formData.put("tableField_lo3pmohx", details);
|
|
-
|
|
|
|
try {
|
|
try {
|
|
ydClient.operateData(YDParam.builder()
|
|
ydClient.operateData(YDParam.builder()
|
|
.formInstanceId(UtilMap.getString(formData, "instanceId"))
|
|
.formInstanceId(UtilMap.getString(formData, "instanceId"))
|
|
@@ -180,25 +191,15 @@ public class YBJController {
|
|
log.info("更新异常, {}",UtilMap.getString(formData, "instanceId") );
|
|
log.info("更新异常, {}",UtilMap.getString(formData, "instanceId") );
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-
|
|
|
|
log.info("更新子表关联表单, {}", dataList.size());
|
|
log.info("更新子表关联表单, {}", dataList.size());
|
|
|
|
|
|
return McR.success();
|
|
return McR.success();
|
|
}
|
|
}
|
|
|
|
|
|
- /**
|
|
|
|
- * 通过安排创建护理任务
|
|
|
|
- * @param request
|
|
|
|
- * @return
|
|
|
|
- */
|
|
|
|
- @PostMapping("syncCreatePlan")
|
|
|
|
- McR syncCreatePlan(HttpServletRequest request) {
|
|
|
|
- ybjService.syncNursePlan();
|
|
|
|
- return McR.success();
|
|
|
|
- }
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
- * 修改打卡数据中的护理计划名称
|
|
|
|
|
|
+ * 打卡列表传数据到打卡页面无法加载关联控件
|
|
|
|
+ * 通过代码将关联控件信息写入到打卡页面
|
|
* @param request
|
|
* @param request
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@@ -206,26 +207,20 @@ public class YBJController {
|
|
McR updatePlanName(HttpServletRequest request) {
|
|
McR updatePlanName(HttpServletRequest request) {
|
|
Map data = UtilServlet.getParamMap(request);
|
|
Map data = UtilServlet.getParamMap(request);
|
|
log.info("修改打卡数据中的护理计划名称{}",data);
|
|
log.info("修改打卡数据中的护理计划名称{}",data);
|
|
-
|
|
|
|
-// List<Map> mapList = Arrays.asList(UtilMap.map("appType, formUuid, instanceId, title, subTitle, formType","APP_YIDJ71B8QORD2YHNZ26Q","FORM-IY966L71PJ8FV10D61M1HBHU6FB320M2765OLM",data.get("relevanceInstanceId").toString(),data.get("titleName").toString(),"",""));;
|
|
|
|
-
|
|
|
|
Map hashMap = new HashMap();
|
|
Map hashMap = new HashMap();
|
|
hashMap.put("associationFormField_lpgi5wv5",YDConf.associationForm("APP_YIDJ71B8QORD2YHNZ26Q","FORM-IY966L71PJ8FV10D61M1HBHU6FB320M2765OLM",data.get("relevanceInstanceId").toString(),data.get("titleName").toString(),"",false));
|
|
hashMap.put("associationFormField_lpgi5wv5",YDConf.associationForm("APP_YIDJ71B8QORD2YHNZ26Q","FORM-IY966L71PJ8FV10D61M1HBHU6FB320M2765OLM",data.get("relevanceInstanceId").toString(),data.get("titleName").toString(),"",false));
|
|
-
|
|
|
|
ydClient.operateData(YDParam.builder()
|
|
ydClient.operateData(YDParam.builder()
|
|
.formInstanceId(data.get("currentInstanceId").toString())
|
|
.formInstanceId(data.get("currentInstanceId").toString())
|
|
.updateFormDataJson(JSON.toJSONString(hashMap))
|
|
.updateFormDataJson(JSON.toJSONString(hashMap))
|
|
.build(), YDConf.FORM_OPERATION.update);
|
|
.build(), YDConf.FORM_OPERATION.update);
|
|
-
|
|
|
|
return McR.success();
|
|
return McR.success();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
@Autowired
|
|
@Autowired
|
|
private DDService ddService;
|
|
private DDService ddService;
|
|
-
|
|
|
|
/**
|
|
/**
|
|
|
|
+ * 地图
|
|
* jsApi 注册
|
|
* jsApi 注册
|
|
*/
|
|
*/
|
|
@PostMapping("register")
|
|
@PostMapping("register")
|
|
@@ -235,47 +230,54 @@ public class YBJController {
|
|
return McR.success(ddService.registerJsApi(data.get("url"), data.get("nonceStr")));
|
|
return McR.success(ddService.registerJsApi(data.get("url"), data.get("nonceStr")));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 同步护理对象坐标地址
|
|
|
|
+ * @param request
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
|
|
+ @RequestMapping("synPointInfo")
|
|
|
|
+ McR synPointInfo(HttpServletRequest request) {
|
|
|
|
+
|
|
|
|
+ YDParam ydParam = new YDParam();
|
|
|
|
+ ydParam = YDParam.builder()
|
|
|
|
+ .formUuid("FORM-RK966E7105DFD27FA7EQHAOH9IFS2RN6MP3OL2") //获取护理计划
|
|
|
|
+ .searchFieldJson(JSON.toJSONString(UtilMap.map("selectField_lo2b6bvf","正常")))//护理对象暂停和正常、月度计划创建只查询正常的护理计划
|
|
|
|
+ .build();
|
|
|
|
+ //pagesize设为1获取总数
|
|
|
|
+ ydParam.setPageSize(1);
|
|
|
|
+ long totalCount = ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_search_form).getTotalCount();
|
|
|
|
+ float pageSize = 50;
|
|
|
|
+ ydParam.setCurrentPage(1);
|
|
|
|
+ ydParam.setPageSize((int) pageSize);
|
|
|
|
+ List<Map> dataList = new ArrayList<>();
|
|
|
|
+ for (int page = 1; page <= Math.ceil(totalCount / pageSize); page++) {
|
|
|
|
+ ydParam.setCurrentPage(page);
|
|
|
|
+ //护理计划 1次获取50条
|
|
|
|
+ dataList = (List<Map>) ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_search_form).getData();
|
|
|
|
+ log.info("dataList:{}-----page:"+page+"---",dataList.size());
|
|
|
|
+ dataList.forEach(dataItem -> {
|
|
|
|
+ Map formMap = (Map) dataItem.get("formData");
|
|
|
|
+ YDParam hldxParam = YDParam.builder()
|
|
|
|
+ .formUuid("FORM-OS566L91C91FO7LJ8V6AQ9O7CGB53OCVUHYNLH1") //获取护理对象
|
|
|
|
+ .searchFieldJson(JSON.toJSONString(UtilMap.map("textField_lnyhv5tn",formMap.get("textField_lnyhv5tn"))))
|
|
|
|
+ .build();
|
|
|
|
+
|
|
|
|
+ List<Map> mapList = (List<Map>) ydClient.queryData(hldxParam, YDConf.FORM_QUERY.retrieve_search_form).getData();
|
|
|
|
+ Map fkmap = (Map) mapList.get(0).get("formData");
|
|
|
|
+ // 更新
|
|
|
|
+ ydClient.operateData(YDParam.builder()
|
|
|
|
+ .formInstanceId((String) dataItem.get("formInstanceId"))
|
|
|
|
+ .updateFormDataJson(JSON.toJSONString(UtilMap.map("textField_lvae99fj, textField_lvae99fk", fkmap.get("textField_ljghmc0e"),fkmap.get("textField_ljghmc0f"))))
|
|
|
|
+ .build(), YDConf.FORM_OPERATION.update);
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
|
|
|
|
+ return McR.success();
|
|
|
|
+ }
|
|
|
|
|
|
@RequestMapping("test")
|
|
@RequestMapping("test")
|
|
McR test(HttpServletRequest request) {
|
|
McR test(HttpServletRequest request) {
|
|
|
|
|
|
-// YDParam ydParam = new YDParam();
|
|
|
|
-// ydParam = YDParam.builder()
|
|
|
|
-// .formUuid("FORM-RK966E7105DFD27FA7EQHAOH9IFS2RN6MP3OL2") //获取护理计划
|
|
|
|
-// .searchFieldJson(JSON.toJSONString(UtilMap.map("selectField_lo2b6bvf","正常")))//护理对象暂停和正常、月度计划创建只查询正常的护理计划
|
|
|
|
-// .build();
|
|
|
|
-// //pagesize设为1获取总数
|
|
|
|
-// ydParam.setPageSize(1);
|
|
|
|
-// long totalCount = ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_search_form).getTotalCount();
|
|
|
|
-// float pageSize = 50;
|
|
|
|
-// ydParam.setCurrentPage(1);
|
|
|
|
-// ydParam.setPageSize((int) pageSize);
|
|
|
|
-// List<Map> dataList = new ArrayList<>();
|
|
|
|
-// for (int page = 1; page <= Math.ceil(totalCount / pageSize); page++) {
|
|
|
|
-// ydParam.setCurrentPage(page);
|
|
|
|
-// //护理计划 1次获取50条
|
|
|
|
-// dataList = (List<Map>) ydClient.queryData(ydParam, YDConf.FORM_QUERY.retrieve_search_form).getData();
|
|
|
|
-// log.info("dataList:{}-----page:"+page+"---",dataList.size());
|
|
|
|
-// dataList.forEach(dataItem -> {
|
|
|
|
-// Map formMap = (Map) dataItem.get("formData");
|
|
|
|
-// YDParam hldxParam = YDParam.builder()
|
|
|
|
-// .formUuid("FORM-OS566L91C91FO7LJ8V6AQ9O7CGB53OCVUHYNLH1") //获取护理对象
|
|
|
|
-// .searchFieldJson(JSON.toJSONString(UtilMap.map("textField_lnyhv5tn",formMap.get("textField_lnyhv5tn"))))
|
|
|
|
-// .build();
|
|
|
|
-//
|
|
|
|
-// List<Map> mapList = (List<Map>) ydClient.queryData(hldxParam, YDConf.FORM_QUERY.retrieve_search_form).getData();
|
|
|
|
-// Map fkmap = (Map) mapList.get(0).get("formData");
|
|
|
|
-//
|
|
|
|
-// // 更新
|
|
|
|
-// ydClient.operateData(YDParam.builder()
|
|
|
|
-// .formInstanceId((String) dataItem.get("formInstanceId"))
|
|
|
|
-// .updateFormDataJson(JSON.toJSONString(UtilMap.map("textField_lvae99fj, textField_lvae99fk", fkmap.get("textField_ljghmc0e"),fkmap.get("textField_ljghmc0f"))))
|
|
|
|
-// .build(), YDConf.FORM_OPERATION.update);
|
|
|
|
-//
|
|
|
|
-// });
|
|
|
|
-// }
|
|
|
|
-
|
|
|
|
return McR.success();
|
|
return McR.success();
|
|
}
|
|
}
|
|
|
|
|
|
@@ -284,6 +286,4 @@ public class YBJController {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
}
|
|
}
|