From a3f44ad3f0b9728a6f9ff4b515a187502bbb39b3 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 31 五月 2024 14:16:06 +0800
Subject: [PATCH] zjh 2024/05/31-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSurveyTemplateController.java | 6
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 310 ++++++++++------
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java | 673 +++++++++++++++++++++++++++++++++++++
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 63 +++
4 files changed, 928 insertions(+), 124 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
new file mode 100644
index 0000000..541ee34
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -0,0 +1,63 @@
+package com.ltkj.web.controller.his;
+
+
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
+import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.hosp.domain.TjCustomer;
+import com.ltkj.hosp.service.ITjCustomerService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/* @Authot:zjh
+ * @Date: 2024-05-30
+ * */
+
+@Component
+public class HisApiMethod {
+ @Autowired
+ private HisApiMethodService controller;
+
+ @Autowired
+ private ITjCustomerService customerService;
+
+
+ //灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
+ public JSONObject getJSONObject (String builder) {
+ return JSONUtil.parseObj (builder);
+ }
+
+ //鑾峰彇鏂规硶杩斿洖鍊间俊鎭�
+ public String getAjaxResult (AjaxResult result) {
+ return result.get ("data").toString ();
+ }
+
+ //瀵规帴his鎬绘帴鍙�
+ public AjaxResult HisApiMethods (TjCustomer customer) {
+
+// Date date = new Date ();
+ AjaxResult result = controller.Outpincreateapply (customer);
+ String result1 = getAjaxResult (result);
+ JSONObject object = getJSONObject (result1);
+ String code = object.getStr ("ResultCode");
+ if (code.equals ("0")) {
+ Map<String, Object> resultData = (Map<String, Object>) object.get ("ResultData");
+ if (null != resultData && resultData.size () > 0) {
+ String cardId = resultData.get ("pationid").toString ();
+ if(null !=cardId){
+ customer.setCardId (cardId);
+ customerService.updateById (customer);
+ }
+ }
+
+ }
+ return AjaxResult.success ();
+ }
+
+}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
new file mode 100644
index 0000000..4f4e9d6
--- /dev/null
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java
@@ -0,0 +1,673 @@
+package com.ltkj.web.controller.his;
+
+
+import com.ltkj.common.core.domain.AjaxResult;
+import com.ltkj.hosp.domain.TjCustomer;
+import com.ltkj.hosp.hisDto.*;
+import com.ltkj.hosp.service.ITjCustomerService;
+import com.ltkj.web.wxUtils.HttpClientUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+
+/* @Authot:zjh
+ * @Date: 2024-05-28
+ * */
+
+@Component
+public class HisApiMethodService {
+ @Autowired
+ private ITjCustomerService tjCustomerService;
+
+ private static final String HIS_URL = "https://mock.mengxuegu.com/mock/664d3dbce45d2156fa209c80/example/api/His/HisRequest";
+
+
+ // @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖娉ㄥ唽淇℃伅")
+ public AjaxResult Outpincreateapply (TjCustomer customer) {
+ Map<String, Object> map = new HashMap<> ();
+ if (null != customer.getCusId ()) {
+ map.put ("pationid", customer.getCusId ());
+ } else {
+ map.put ("pationid", null);
+ }
+ map.put ("brxm", customer.getCusName ());
+ map.put ("brxb", customer.getCusSex ());
+ map.put ("csrq", customer.getCusBrithday ());
+ map.put ("brnl", customer.getAge ());
+ map.put ("brnldw", customer.getAgeUnit ());
+ map.put ("addr", customer.getAddr ());
+ map.put ("gzdw", null);
+ map.put ("dwdz", null);
+ map.put ("lxr", customer.getCusName ());
+ map.put ("lxrdh", customer.getCusPhone ());
+ map.put ("lxrgx", "鏈汉");
+ map.put ("sfzh", customer.getCusIdcard ());
+ map.put ("jhrxm", null);
+ map.put ("jhrsfzh", null);
+ map.put ("mz", customer.getCusNational ());
+ map.put ("zy", customer.getCareer ());
+ map.put ("fbbm", null);
+ map.put ("czy", customer.getCreateBy ());
+ map.put ("jkkkh", customer.getIndexCard ());
+ map.put ("mindex_id", customer.getIndexCard ());
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "闂ㄨ瘖鍖荤敓鎺ヨ瘖")
+// jzh = "灏辫瘖鍙�"
+//jzrq = "鎺ヨ瘖鏃ユ湡"
+//jzysbm = "鎺ヨ瘖鍖诲笀"
+ public AjaxResult Outpinconapply (String jzh,
+ Date jzrq,
+ String jzysbm) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("jzh", jzh);
+ map.put ("jzrq", jzrq);
+ map.put ("jzysbm", jzysbm);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "闂ㄨ瘖鍖荤敓鍙栨秷鎺ヨ瘖")
+ public AjaxResult Outpinunconapply (String jzh,
+ Date jzrq,
+ String jzysbm) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("jzh", jzh);
+ map.put ("jzrq", jzrq);
+ map.put ("jzysbm", jzysbm);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+ // @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖璇婃柇")
+ public AjaxResult Outpinimpapply (OutpinimpapplyDto dto) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", dto.getHisRegistrationId ());
+ map.put ("mzzdid", dto.getMzzdid ());
+ map.put ("sqysbm", dto.getSqysbm ());
+ map.put ("mzksbm", dto.getMzksbm ());
+ map.put ("fbrq", dto.getFbrq ());
+ map.put ("zdrq", dto.getZdrq ());
+ map.put ("czybm", dto.getCzybm ());
+ map.put ("czyksbm", dto.getCzyksbm ());
+ map.put ("zs", dto.getZs ());
+ map.put ("bs", dto.getBs ());
+ map.put ("clyz", dto.getClyz ());
+ map.put ("jws", dto.getJws ());
+ map.put ("tgjc", dto.getTgjc ());
+ map.put ("gms", dto.getGms ());
+ map.put ("jbbm", dto.getJbbm ());
+ map.put ("jbbm1", dto.getJbbm1 ());
+ map.put ("jbbm2", dto.getJbbm2 ());
+ map.put ("tw", dto.getTw ());
+ map.put ("mb", dto.getMb ());
+ map.put ("hx", dto.getHx ());
+ map.put ("bp", dto.getBp ());
+ map.put ("fzbz", dto.getFzbz ());
+ map.put ("hzqx", dto.getHzqx ());
+ map.put ("sfqc", dto.getSfqc ());
+ map.put ("qchs", dto.getQchs ());
+ map.put ("sfqj", dto.getSfqj ());
+ map.put ("ckrq", dto.getCkrq ());
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "闂ㄨ瘖棰勪氦鏀惰垂")
+ public AjaxResult Outpinmesapply (String pationid,
+ String czybm,
+ String zflxbm,
+ int yjje) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("pationid", pationid);
+ map.put ("czybm", czybm);
+ map.put ("zflxbm", zflxbm);
+ map.put ("yjje", yjje);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "鏂板/淇敼闂ㄨ瘖鎸傚彿鐢宠")
+ public AjaxResult Outpinregapply (OutpinregapplyDto dao) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("pationid", dao.getPationid ());
+ map.put ("his_registration_id", dao.getHisRegistrationId ());
+ map.put ("sqysbm", dao.getSqysbm ());
+ map.put ("mzksbm", dao.getMzksbm ());
+ map.put ("czybm", dao.getCzybm ());
+ map.put ("sfjz", dao.getSfjz ());
+ map.put ("ghzlbm", dao.getGhzlbm ());
+ map.put ("ywckbm", dao.getYwckbm ());
+ map.put ("sflstd", dao.getSflstd ());
+ map.put ("ghrq", dao.getGhrq ());
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+ // @ApiOperation(value = "闂ㄨ瘖妫�楠岀敵璇�")
+ public AjaxResult Outpintestapply (OutpintestapplyDto dao) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", dao.getHisRegistrationId ());
+ map.put ("sfzh", dao.getHisRegistrationId ());
+ map.put ("sqysbm", dao.getSqysbm ());
+ map.put ("mzksbm", dao.getMzksbm ());
+ map.put ("sjrq", dao.getSjrq ());
+ map.put ("czybm", dao.getCzybm ());
+ map.put ("czyksbm", dao.getCzyksbm ());
+ map.put ("sfjz", dao.getSfjz ());
+ map.put ("details", dao.getDetails ());
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "浣滃簾闂ㄨ瘖妫�楠岀敵璇�")
+ public AjaxResult Outpindeltestapply (String hisRegistrationId,
+ String czybm,
+ String sqdh) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", hisRegistrationId);
+ map.put ("czybm", czybm);
+ map.put ("zflxbm", sqdh);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "闂ㄨ瘖妫�鏌ョ敵璇�")
+ public AjaxResult Outpinexamapply (OutpinexamapplyDto dao) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", dao.getHisRegistrationId ());
+ map.put ("sfzh", dao.getHisRegistrationId ());
+ map.put ("sqysbm", dao.getSqysbm ());
+ map.put ("mzksbm", dao.getMzksbm ());
+ map.put ("sjrq", dao.getSjrq ());
+ map.put ("czybm", dao.getCzybm ());
+ map.put ("czyksbm", dao.getCzyksbm ());
+ map.put ("lczz", dao.getLczz ());
+ map.put ("lczd", dao.getLczd ());
+ map.put ("jcms", dao.getJcms ());
+ map.put ("jcbw", dao.getJcbw ());
+ map.put ("sfjz", dao.getSfjz ());
+ map.put ("details", dao.getDetails ());
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�")
+ public AjaxResult Outpindelexamapply (String hisRegistrationId,
+ String czybm,
+ String sqdh) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", hisRegistrationId);
+ map.put ("czybm", czybm);
+ map.put ("zflxbm", sqdh);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "闂ㄨ瘖鍖荤枟鍖诲槺鐢宠")
+ public AjaxResult Outpinmedapply (OutpinmedapplyDto dao) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", dao.getHisRegistrationId ());
+ map.put ("sfzh", dao.getHisRegistrationId ());
+ map.put ("sqysbm", dao.getSqysbm ());
+ map.put ("mzksbm", dao.getMzksbm ());
+ map.put ("sjrq", dao.getSjrq ());
+ map.put ("czybm", dao.getCzybm ());
+ map.put ("czyksbm", dao.getCzyksbm ());
+ map.put ("bqsm", dao.getBqsm ());
+ map.put ("sfjz", dao.getSfjz ());
+ map.put ("details", dao.getDetails ());
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "浣滃簾闂ㄨ瘖鍖荤枟鍖诲槺鐢宠")
+ public AjaxResult Outpindelmedapply (String hisRegistrationId,
+ String czybm,
+ String sqdh) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", hisRegistrationId);
+ map.put ("czybm", czybm);
+ map.put ("zflxbm", sqdh);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "闂ㄨ瘖娌荤枟澶勭疆鐢宠")
+ public AjaxResult Outpintreatapply (OutpintreatapplyDto dao) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", dao.getHisRegistrationId ());
+ map.put ("sfzh", dao.getHisRegistrationId ());
+ map.put ("sqysbm", dao.getSqysbm ());
+ map.put ("mzksbm", dao.getMzksbm ());
+ map.put ("sjrq", dao.getSjrq ());
+ map.put ("czybm", dao.getCzybm ());
+ map.put ("czyksbm", dao.getCzyksbm ());
+ map.put ("bqsm", dao.getBqsm ());
+ map.put ("sfjz", dao.getSfjz ());
+ map.put ("zlbz", dao.getZlbz ());
+ map.put ("details", dao.getDetails ());
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+ // @ApiOperation(value = "浣滃簾闂ㄨ瘖娌荤枟澶勭疆鐢宠")
+ public AjaxResult Outpintdelreatapply (String hisRegistrationId,
+ String czybm,
+ String sqdh) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", hisRegistrationId);
+ map.put ("czybm", czybm);
+ map.put ("zflxbm", sqdh);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "闂ㄨ瘖鑽搧鐢宠")
+ public AjaxResult Outpinmedicapply (OutpinmedicapplyDto dao) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", dao.getHisRegistrationId ());
+ map.put ("sfzh", dao.getHisRegistrationId ());
+ map.put ("sqysbm", dao.getSqysbm ());
+ map.put ("mzksbm", dao.getMzksbm ());
+ map.put ("sjrq", dao.getSjrq ());
+ map.put ("czybm", dao.getCzybm ());
+ map.put ("czyksbm", dao.getCzyksbm ());
+ map.put ("cflxbm", dao.getCflxbm ());
+ map.put ("yfbm", dao.getYfbm ());
+ map.put ("fyts", dao.getFyts ());
+ map.put ("mzzd", dao.getMzzd ());
+ map.put ("details", dao.getDetails ());
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+ // @ApiOperation(value = "浣滃簾闂ㄨ瘖鑽搧鐢宠")
+ public AjaxResult Outpindelmedicapply (String hisRegistrationId,
+ String czybm,
+ String sqdh) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", hisRegistrationId);
+ map.put ("czybm", czybm);
+ map.put ("zflxbm", sqdh);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "鑾峰彇妫�鏌ョ敵璇蜂俊鎭�")
+ public AjaxResult Getexamapplyinfo (String hisRegistrationId,
+ String ksbm,
+ Date jsrq,
+ Date ksrq) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", hisRegistrationId);
+ map.put ("ksbm", ksbm);
+ map.put ("jsrq", jsrq);
+ map.put ("ksrq", ksrq);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "鑾峰彇妫�鏌ユ姤鍛婁俊鎭�")
+ public AjaxResult Getexamreportinfo (String hisRegistrationId,
+ String ksmc,
+ String pationid,
+ Date jsrq,
+ Date ksrq,
+ Integer pagecount,
+ Integer page,
+ String status,
+ String cardtype) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", hisRegistrationId);
+ map.put ("ksmc", ksmc);
+ map.put ("jsrq", jsrq);
+ map.put ("ksrq", ksrq);
+ map.put ("pationid", pationid);
+ map.put ("pagecount", pagecount);
+ map.put ("page", page);
+ map.put ("status", status);
+ map.put ("cardtype", cardtype);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+ // @ApiOperation(value = "鏂板/淇敼妫�鏌ユ姤鍛婅褰�")
+ public AjaxResult Examreportrecordinfo (ExamreportrecordinfoDto dto) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", dto.getHisRegistrationId ());
+ map.put ("jcbgid", dto.getJcbgid ());
+ map.put ("sfjz", dto.getSfjz ());
+ map.put ("pationid", dto.getPationid ());
+ map.put ("mzzybz", dto.getMzzybz ());
+ map.put ("brxm", dto.getBrxm ());
+ map.put ("brxb", dto.getBrxb ());
+ map.put ("brnl", dto.getBrnl ());
+ map.put ("brnldw", dto.getBrnldw ());
+ map.put ("lxrdh", dto.getLxrdh ());
+ map.put ("hzksbm", dto.getHzksbm ());
+ map.put ("sqdh", dto.getSqdh ());
+ map.put ("sqjgdm", dto.getSqjgdm ());
+ map.put ("sqsj", dto.getSqsj ());
+ map.put ("sqrbm", dto.getSqrbm ());
+ map.put ("sqrxm", dto.getSqrxm ());
+ map.put ("hzzs", dto.getHzzs ());
+ map.put ("hzbs", dto.getHzbs ());
+ map.put ("xyzdbm", dto.getXyzdbm ());
+ map.put ("xyzdmc", dto.getXyzdmc ());
+ map.put ("zdrq", dto.getZdrq ());
+ map.put ("fbrq", dto.getFbrq ());
+ map.put ("tsjcbz", dto.getTsjcbz ());
+ map.put ("jcxmdm", dto.getJcxmdm ());
+ map.put ("jcxmmc", dto.getJcxmmc ());
+ map.put ("jcjgdm", dto.getJcjgdm ());
+ map.put ("jcjsbh", dto.getJcjsbh ());
+ map.put ("jcjsxm", dto.getJcjsxm ());
+ map.put ("jcrq", dto.getJcrq ());
+ map.put ("jcbgdbh", dto.getJcbgdbh ());
+ map.put ("jcff", dto.getJcff ());
+ map.put ("jcksbh", dto.getJcksbh ());
+ map.put ("jcksmc", dto.getJcksmc ());
+ map.put ("yqbm", dto.getYqbm ());
+ map.put ("jcbgbz", dto.getJcbgbz ());
+ map.put ("jcbwdm", dto.getJcbwdm ());
+ map.put ("bgksbh", dto.getBgksbh ());
+ map.put ("bgksmc", dto.getBgksmc ());
+ map.put ("bgrq", dto.getBgrq ());
+ map.put ("bgysbh", dto.getBgysbh ());
+ map.put ("bgysxm", dto.getBgysxm ());
+ map.put ("shysbh", dto.getShysbh ());
+ map.put ("shysxm", dto.getShysxm ());
+ map.put ("jch", dto.getJch ());
+ map.put ("yxh", dto.getYxh ());
+ map.put ("kdsj", dto.getKdsj ());
+ map.put ("jclx", dto.getJclx ());
+ map.put ("yyh", dto.getYyh ());
+ map.put ("yxbx", dto.getYxbx ());
+ map.put ("yxzd", dto.getYxzd ());
+ map.put ("sfyyx", dto.getSfyyx ());
+ map.put ("yxzl", dto.getYxzl ());
+ map.put ("yxs", dto.getYxs ());
+ map.put ("jlysbh", dto.getJlysbh ());
+ map.put ("jlrq", dto.getJlrq ());
+ map.put ("bgzt", dto.getBgzt ());
+ map.put ("lczdfh", dto.getLczdfh ());
+ map.put ("wjz", dto.getWjz ());
+ map.put ("wjzzdmc", dto.getWjzzdmc ());
+ map.put ("wjzjcysyj", dto.getWjzjcysyj ());
+ map.put ("wjzjcysbh", dto.getWjzjcysbh ());
+ map.put ("wjzjcysxyj", dto.getWjzjcysyj ());
+ map.put ("wjzqrrq", dto.getWjzqrrq ());
+ map.put ("wjzjsrbh", dto.getWjzjsrbh ());
+ map.put ("wjzjsrxm", dto.getWjzjsrxm ());
+ map.put ("wjzjsrq", dto.getWjzjsrq ());
+ map.put ("wjzclysbh", dto.getWjzclysbh ());
+ map.put ("wjzclysxm", dto.getWjzclysxm ());
+ map.put ("wjzclyj", dto.getWjzclyj ());
+ map.put ("wjzclrq", dto.getWjzclrq ());
+ map.put ("sfkf", dto.getSfkf ());
+ map.put ("yzid", dto.getYzid ());
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+ // @ApiOperation(value = "鑾峰彇妫�鏌ュ嵄鎬ュ�间俊鎭�")
+ public AjaxResult Getexamurgentinfo (String hisRegistrationId,
+ Date jsrq,
+ Date ksrq,
+ Integer pagecount,
+ Integer page) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", hisRegistrationId);
+ map.put ("jsrq", jsrq);
+ map.put ("ksrq", ksrq);
+ map.put ("pagecount", pagecount);
+ map.put ("page", page);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "鑾峰彇妫�鏌ュ奖鍍忎俊鎭�")
+ public AjaxResult Getexamimageinfo (String hisRegistrationId,
+ Date jsrq,
+ Date ksrq,
+ Integer pagecount,
+ Integer page) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", hisRegistrationId);
+ map.put ("jsrq", jsrq);
+ map.put ("ksrq", ksrq);
+ map.put ("pagecount", pagecount);
+ map.put ("page", page);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "鑾峰彇妫�楠岀敵璇蜂俊鎭�")
+ public AjaxResult Getlabapplyinfo (String hisRegistrationId,
+ Date jsrq,
+ Date ksrq,
+ String cardtype,
+ String mzorzy,
+ String ksbm) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", hisRegistrationId);
+ map.put ("jsrq", jsrq);
+ map.put ("ksrq", ksrq);
+ map.put ("cardtype", cardtype);
+ map.put ("mzorzy", mzorzy);
+ map.put ("ksbm", ksbm);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "鑾峰彇妫�楠屾姤鍛婅褰曚俊鎭�")
+ public AjaxResult Getlabreportinfo (String hisRegistrationId,
+ Date jsrq,
+ Date ksrq,
+ String ksbm,
+ String pationid,
+ Integer pagecount,
+ Integer page) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", hisRegistrationId);
+ map.put ("jsrq", jsrq);
+ map.put ("ksrq", ksrq);
+ map.put ("ksbm", ksbm);
+ map.put ("pationid", pationid);
+ map.put ("pagecount", pagecount);
+ map.put ("page", page);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "鑾峰彇寰敓鐗╂姤鍛婅褰曚俊鎭�")
+ public AjaxResult Getlabgermrepinfo (String jybgid) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("jybgid", jybgid);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+ // @ApiOperation(value = "鑾峰彇寰敓鐗╄嵂鏁忎俊鎭�")
+ public AjaxResult Getlabgermdetailinfo (String jybgid) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("jybgid", jybgid);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "鑾峰彇鍗辨�ュ�间俊鎭�")
+ public AjaxResult Getlaburgentinfo (String jybgid,
+ Date jsrq,
+ Date ksrq) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("jybgid", jybgid);
+ map.put ("jsrq", jsrq);
+ map.put ("ksrq", ksrq);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "妫�楠屾牱鏈嫆鏀惰褰�")
+ public AjaxResult Labreportapply (String tmh,
+ String jsrydm,
+ Date jsrq,
+ String jsyy) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("tmh", tmh);
+ map.put ("jsrydm", jsrydm);
+ map.put ("jsrq", jsrq);
+ map.put ("jsyy", jsyy);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "鑾峰彇妫�楠岀櫥璁颁俊鎭�")
+ public AjaxResult Getlabreginfoinfo (String hisRegistrationId,
+ Date jsrq,
+ Date ksrq,
+ String Status,
+ String pationid,
+ Integer pagecount,
+ Integer page) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", hisRegistrationId);
+ map.put ("Status", Status);
+ map.put ("jsrq", jsrq);
+ map.put ("ksrq", ksrq);
+ map.put ("pationid", pationid);
+ map.put ("pagecount", pagecount);
+ map.put ("page", page);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+ // @ApiOperation(value = "浣撴璐圭敤鐢宠")
+ public AjaxResult Testcostapply (TestcostapplyDto dao) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", dao.getHisRegistrationId ());
+ map.put ("czybm", dao.getCzybm ());
+ map.put ("czyksbm", dao.getCzyksbm ());
+ map.put ("brxm", dao.getBrxm ());
+ map.put ("ywck", dao.getYwck ());
+ map.put ("sfzh", dao.getSfzh ());
+ map.put ("jkkkh", dao.getJkkkh ());
+ map.put ("mindexId", dao.getMindexId ());
+ map.put ("brxb", dao.getBrxb ());
+ map.put ("csrq", dao.getCsrq ());
+ map.put ("brnl", dao.getBrnl ());
+ map.put ("brnldw", dao.getBrnldw ());
+ map.put ("addr", dao.getAddr ());
+ map.put ("lxrdh", dao.getLxrdh ());
+ map.put ("mz", dao.getMz ());
+ map.put ("zy", dao.getZy ());
+ map.put ("details", dao.getDetails ());
+ map.put ("mxfyxmbm", dao.getMxfyxmbm ());
+ map.put ("sfzhfy", dao.getSfzhfy ());
+ map.put ("sl", dao.getSl ());
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "鏂板鎴栦慨鏀逛綋妫�鐧昏淇℃伅")
+ public AjaxResult Testregapply (TestregapplyDto dao) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", dao.getHisRegistrationId ());
+ map.put ("czybm", dao.getCzybm ());
+ map.put ("czyksbm", dao.getCzyksbm ());
+ map.put ("tjbh", dao.getTjbh ());
+ map.put ("grbh", dao.getGrbh ());
+ map.put ("sfzh", dao.getSfzh ());
+ map.put ("xm", dao.getXm ());
+ map.put ("xb", dao.getXb ());
+ map.put ("nl", dao.getNl ());
+ map.put ("csrq", dao.getCsrq ());
+ map.put ("nldw", dao.getNldw ());
+ map.put ("addr", dao.getAddr ());
+ map.put ("sj", dao.getSj ());
+ map.put ("dwbm", dao.getDwbm ());
+ map.put ("tcbm", dao.getTcbm ());
+ map.put ("details", dao.getDetails ());
+ map.put ("je", dao.getJe ());
+ map.put ("sjje", dao.getSjje ());
+ map.put ("details_mx", dao.getDetailsMx ());
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "鑾峰彇闂ㄨ瘖鎮ｈ�呰垂鐢ㄦ竻鍗曚俊鎭�")
+ public AjaxResult Getoutpatientcostinfo (String cardtype,
+ Date jsrq,
+ Date ksrq,
+ String input,
+ Integer pagecount,
+ Integer page) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("cardtype", cardtype);
+ map.put ("input", input);
+ map.put ("jsrq", jsrq);
+ map.put ("ksrq", ksrq);
+ map.put ("pagecount", pagecount);
+ map.put ("page", page);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "鑾峰彇闂ㄨ瘖缁撶畻璁板綍")
+ public AjaxResult Getoutaccountrecord (String hisRegistrationId,
+ Date jsrq,
+ Date ksrq,
+ Integer pagecount,
+ Integer page) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("his_registration_id", hisRegistrationId);
+ map.put ("jsrq", jsrq);
+ map.put ("ksrq", ksrq);
+ map.put ("pagecount", pagecount);
+ map.put ("page", page);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+
+
+ // @ApiOperation(value = "鑾峰彇鎮ｈ�呮敞鍐屼俊鎭紙鍚彉鏇磋褰曪級")
+ public AjaxResult Getpatientalterregrecord (String mzzybz,
+ Date jsrq,
+ Date ksrq) {
+ Map<String, Object> map = new HashMap<> ();
+ map.put ("mzzybz", mzzybz);
+ map.put ("jsrq", jsrq);
+ map.put ("ksrq", ksrq);
+ String post = HttpClientUtils.sendPost (HIS_URL, map);
+ return AjaxResult.success ().put ("data", post);
+ }
+}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index b7a9b2e..7bcfc79 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -238,10 +238,10 @@
tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
}
- if(tjFlowingWater.getDiscount()==null){
- transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(),new BigDecimal(10), tjOrder.getTjNumber());
- }else {
- transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(),BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber());
+ if (tjFlowingWater.getDiscount() == null) {
+ transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), new BigDecimal(10), tjOrder.getTjNumber());
+ } else {
+ transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber());
}
tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
@@ -404,10 +404,10 @@
TjProject one = projectService.getOne(wq1);
if (one != null) {
// if (one.getProParentId() != 0) {
- tjOrderDetail.setTjStatus(2L);
- tjOrderDetail.setProResult("寮冩");
- tjOrderDetail.setUpdateTime(new DateTime());
- tjOrderDetailService.updateById(tjOrderDetail);
+ tjOrderDetail.setTjStatus(2L);
+ tjOrderDetail.setProResult("寮冩");
+ tjOrderDetail.setUpdateTime(new DateTime());
+ tjOrderDetailService.updateById(tjOrderDetail);
// } else {
// tjOrderDetail.setTjStatus(1L);
// tjOrderDetail.setUpdateTime(new DateTime());
@@ -416,7 +416,7 @@
// LambdaQueryWrapper<TjOrderRemark> wq=new LambdaQueryWrapper<>();
// wq.eq(TjOrderRemark::getTjNumber,tjNumber);
// wq.eq(TjOrderRemark::getProId,tjOrderDetail.getProId());
- orderRemarkService.updateTjOrderRemark(tjNumber, String.valueOf(tjOrderDetail.getProId()));
+ orderRemarkService.updateTjOrderRemark(tjNumber, String.valueOf(tjOrderDetail.getProId()));
//缁欏純妫�琛ㄦ坊鍔犺褰�
TjDiscardInspection td = new TjDiscardInspection();
td.setProId(String.valueOf(one.getProId()));
@@ -455,14 +455,14 @@
@Async("async")
public void updateOrdeltile2(TjOrderDetail detail, SysUser sysUser) {
// for (TjOrderDetail detail : tjOrderDetailList) {
- detail.setTjStatus(1L);
- LambdaQueryWrapper<TjStandard> wq0 = new LambdaQueryWrapper<>();
- wq0.eq(TjStandard::getProId, detail.getProId());
- detail.setUpdateBy(sysUser.getNickName());
- detail.setUpdateTime(new Date());
- detail.setCreateId(String.valueOf(sysUser.getUserId()));
- detail.setUpdateId(String.valueOf(sysUser.getUserId()));
- tjOrderDetailService.updateById(detail);
+ detail.setTjStatus(1L);
+ LambdaQueryWrapper<TjStandard> wq0 = new LambdaQueryWrapper<>();
+ wq0.eq(TjStandard::getProId, detail.getProId());
+ detail.setUpdateBy(sysUser.getNickName());
+ detail.setUpdateTime(new Date());
+ detail.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderDetailService.updateById(detail);
// }
}
@@ -472,39 +472,95 @@
List<TjConsumables> list2 = new ArrayList<>();
String[] tjProIds = tjFlowingWater.getTjProIds();
for (String tjProId : tjProIds) {
+ LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
+ wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
TjProject project = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
- TjOrderRemark tjOrderRemark = new TjOrderRemark();
- tjOrderRemark.setProId(Long.valueOf(tjProId));
- tjOrderRemark.setProName(project.getProName());
- tjOrderRemark.setDeptId(project.getDeptId());
- tjOrderRemark.setTjNumber(order.getTjNumber());
- tjOrderRemark.setCreateBy(sysUser.getNickName());
- tjOrderRemark.setCreateTime(new Date());
- tjOrderRemark.setUpdateBy(sysUser.getNickName());
- tjOrderRemark.setUpdateTime(new Date());
- tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
- tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
- orderRemarkService.save(tjOrderRemark);
- List<Long> proIds = projectService.getTjProjectListBySoneId(tjProId).stream().map(TjProject::getProId).collect(Collectors.toList());
- TjOrderDetail detail = new TjOrderDetail();
- detail.setTjStatus(0L);
- detail.setOrderId(tjFlowingWater.getOrderId());
- detail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
- detail.setProId(Long.valueOf(tjProId));
- detail.setIsAddition("Y");
- detail.setCreateBy(sysUser.getNickName());
- detail.setCreateTime(new Date());
- detail.setUpdateBy(sysUser.getNickName());
- detail.setUpdateTime(new Date());
- detail.setCreateId(String.valueOf(sysUser.getUserId()));
- detail.setUpdateId(String.valueOf(sysUser.getUserId()));
- tjOrderDetailService.save(detail);
- for (Long proId : proIds) {
+ if (null != project && project.getProParentId() == 0) {
+ TjOrderRemark tjOrderRemark = new TjOrderRemark();
+ tjOrderRemark.setProId(Long.valueOf(tjProId));
+ tjOrderRemark.setProName(project.getProName());
+ tjOrderRemark.setDeptId(project.getDeptId());
+ tjOrderRemark.setTjNumber(order.getTjNumber());
+ tjOrderRemark.setCreateBy(sysUser.getNickName());
+ tjOrderRemark.setCreateTime(new Date());
+ tjOrderRemark.setUpdateBy(sysUser.getNickName());
+ tjOrderRemark.setUpdateTime(new Date());
+ tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
+ tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+ orderRemarkService.save(tjOrderRemark);
+
+ List<Long> proIds = projectService.getTjProjectListBySoneId(tjProId).stream().map(TjProject::getProId).collect(Collectors.toList());
+ TjOrderDetail detail = new TjOrderDetail();
+ detail.setTjStatus(0L);
+ detail.setOrderId(tjFlowingWater.getOrderId());
+ detail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ detail.setProId(Long.valueOf(tjProId));
+ detail.setIsAddition("Y");
+ detail.setCreateBy(sysUser.getNickName());
+ detail.setCreateTime(new Date());
+ detail.setUpdateBy(sysUser.getNickName());
+ detail.setUpdateTime(new Date());
+ detail.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderDetailService.save(detail);
+ for (Long proId : proIds) {
+ TjOrderDetail detail1 = new TjOrderDetail();
+ detail1.setTjStatus(0L);
+ detail1.setOrderId(tjFlowingWater.getOrderId());
+ detail1.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ detail1.setProId(proId);
+ detail1.setIsAddition("Y");
+ detail.setCreateBy(sysUser.getNickName());
+ detail.setCreateTime(new Date());
+ detail.setUpdateBy(sysUser.getNickName());
+ detail.setUpdateTime(new Date());
+ detail.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderDetailService.save(detail1);
+ }
+ wqq.in(TbTransition::getProId, proIds);
+ } else {
+
+ wqq.in(TbTransition::getProId, Arrays.asList(tjProIds));
+
+ TjProject projects = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
+ if (null != projects) {
+ TjProject projectss = projectService.selectTjProjectByProId(projects.getProParentId());
+ if (null != projectss) {
+ TjOrderRemark tjOrderRemark = new TjOrderRemark();
+ tjOrderRemark.setProId(Long.valueOf(tjProId));
+ tjOrderRemark.setProName(projectss.getProName());
+ tjOrderRemark.setDeptId(projectss.getDeptId());
+ tjOrderRemark.setTjNumber(order.getTjNumber());
+ tjOrderRemark.setCreateBy(sysUser.getNickName());
+ tjOrderRemark.setCreateTime(new Date());
+ tjOrderRemark.setUpdateBy(sysUser.getNickName());
+ tjOrderRemark.setUpdateTime(new Date());
+ tjOrderRemark.setCreateId(String.valueOf(sysUser.getUserId()));
+ tjOrderRemark.setUpdateId(String.valueOf(sysUser.getUserId()));
+ orderRemarkService.save(tjOrderRemark);
+ }
+ }
+// List<Long> proIds = projectService.getTjProjectListBySoneId(tjProId).stream().map(TjProject::getProId).collect(Collectors.toList());
+ TjOrderDetail detail = new TjOrderDetail();
+ detail.setTjStatus(0L);
+ detail.setOrderId(tjFlowingWater.getOrderId());
+ detail.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
+ detail.setProId(Long.valueOf(tjProId));
+ detail.setIsAddition("Y");
+ detail.setCreateBy(sysUser.getNickName());
+ detail.setCreateTime(new Date());
+ detail.setUpdateBy(sysUser.getNickName());
+ detail.setUpdateTime(new Date());
+ detail.setCreateId(String.valueOf(sysUser.getUserId()));
+ detail.setUpdateId(String.valueOf(sysUser.getUserId()));
+ tjOrderDetailService.save(detail);
+// for (Long proId : proIds) {
TjOrderDetail detail1 = new TjOrderDetail();
detail1.setTjStatus(0L);
detail1.setOrderId(tjFlowingWater.getOrderId());
detail1.setFlowingWaterId(String.valueOf(tjFlowingWater.getTjSerialNumber()));
- detail1.setProId(proId);
+ detail1.setProId(Long.valueOf(tjProId));
detail1.setIsAddition("Y");
detail.setCreateBy(sysUser.getNickName());
detail.setCreateTime(new Date());
@@ -513,12 +569,9 @@
detail.setCreateId(String.valueOf(sysUser.getUserId()));
detail.setUpdateId(String.valueOf(sysUser.getUserId()));
tjOrderDetailService.save(detail1);
+// }
}
- LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
- wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
- if ( proIds.size() > 0){
- wqq.in(TbTransition::getProId, proIds);
- }
+
List<TbTransition> tbTransitionList = transitionService.list(wqq);
if (null != tbTransitionList && tbTransitionList.size() > 0) {
for (TbTransition transition : tbTransitionList) {
@@ -542,8 +595,9 @@
}
}
//鐖堕」
- TjProject parentProject = projectService.getById(tjProId);
- if (null != parentProject) {
+
+ TjProject parentProject = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
+ if (null != parentProject && parentProject.getProParentId() == 0) {
LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
wqqq.eq(TjProConsumables::getProId, parentProject.getProId());
List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
@@ -551,6 +605,20 @@
for (TjProConsumables tjProConsumables : proConsumables) {
TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
list2.add(tjConsumables);
+ }
+ }
+
+ } else {
+ TjProject parentProjects = projectService.getById(tjProId);
+ if (null != parentProjects) {
+ LambdaQueryWrapper<TjProConsumables> wqqq = new LambdaQueryWrapper<>();
+ wqqq.eq(TjProConsumables::getProId, parentProjects.getProId());
+ List<TjProConsumables> proConsumables = proConsumablesService.list(wqqq);
+ if (null != proConsumables && proConsumables.size() > 0) {
+ for (TjProConsumables tjProConsumables : proConsumables) {
+ TjConsumables tjConsumables = consumablesService.selectTjConsumablesById(tjProConsumables.getConsumablesId());
+ list2.add(tjConsumables);
+ }
}
}
}
@@ -588,17 +656,17 @@
@Override
@Async("async")
- public void dockerSetYjCustomerByRedis(Long orderId,Long ksId) {
+ public void dockerSetYjCustomerByRedis(Long orderId, Long ksId) {
//宸叉(鍗曚釜瀛樺叆)0鏈,1宸叉
- getDgYjAjaxResult(orderId,ksId);
+ getDgYjAjaxResult(orderId, ksId);
}
@Override
@Async("async")
- public void dockerSetWjCustomerByRedis(Long orderId,Long ksId) {
+ public void dockerSetWjCustomerByRedis(Long orderId, Long ksId) {
//鏈(鍗曚釜瀛樺叆)0鏈,1宸叉
- getDgWjAjaxResult(orderId,ksId);
+ getDgWjAjaxResult(orderId, ksId);
}
@Override
@@ -713,9 +781,9 @@
@Override
@Async("async")
public void tjGoutAsync(List<QjDomainVo> domainVos, SysUser sysUser, Set<String> list) {
- Integer day=0;
+ Integer day = 0;
for (QjDomainVo domainVo : domainVos) {
- day=domainVo.getDay();
+ day = domainVo.getDay();
TjOrderRemark remark = orderRemarkService.getById(domainVo.getRemarkId());
TjOrder order = orderService.getOrderByTjNum(domainVo.getTjNumber());
//缁欏純妫�琛ㄦ坊鍔犺褰�
@@ -758,7 +826,7 @@
}
}
if (list.size() > 0) {
- Date date=new Date();
+ Date date = new Date();
for (String s : list) {
TjOrder tjOrder = orderService.getOrderByTjNum(s);
if (null != tjOrder) {
@@ -775,7 +843,7 @@
yqOrder.setSex(String.valueOf(customer.getCusSex()));
yqOrder.setAge(customer.getAge());
yqOrder.setPhone(customer.getCusPhone());
- yqOrder.setYqTime(DateUtil.offsetDay(date,day));
+ yqOrder.setYqTime(DateUtil.offsetDay(date, day));
yqOrder.setOrderTime(tjOrder.getCreateTime());
yqOrder.setProIds(orderRemarkService.getTjOrderRemarkProIdList(s));
yqOrder.setEmilSend("0");
@@ -1008,10 +1076,10 @@
@Override
public void addTjChargingStandard(TjOrder order, List<TbTransition> tbTransitionList, SysUser sysUser) {
- List<TjConsumables> list2=new ArrayList<>();
+ List<TjConsumables> list2 = new ArrayList<>();
for (TbTransition transition : tbTransitionList) {
- if(transition.getNowPrice().compareTo(BigDecimal.valueOf(0))==0){
+ if (transition.getNowPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
continue;
}
@@ -1438,10 +1506,10 @@
}
LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
- qww.eq(TjOrderDetail::getTjStatus,0);
+ qww.eq(TjOrderDetail::getTjStatus, 0);
qww.isNotNull(TjOrderDetail::getFlowingWaterId);
List<TjOrderDetail> lists = tjOrderDetailService.list(qww);
- if (null != lists&&lists.size()>0) {
+ if (null != lists && lists.size() > 0) {
continue;
}
@@ -1450,7 +1518,7 @@
//閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
for (TjOrderDetail tjOrderDetail11 : lists) {
customer.setIsPositive(tjOrderDetail11.getIsPositive());
- if (tjOrderDetail11.getIsPositive()==1){
+ if (tjOrderDetail11.getIsPositive() == 1) {
break;
}
}
@@ -1526,7 +1594,7 @@
//閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
for (TjOrderDetail tjOrderDetail11 : lists) {
customer.setIsPositive(tjOrderDetail11.getIsPositive());
- if (tjOrderDetail11.getIsPositive()==1){
+ if (tjOrderDetail11.getIsPositive() == 1) {
break;
}
}
@@ -1556,7 +1624,7 @@
StringBuilder stringBuilder = new StringBuilder();
for (TjOrderRemark remark : list) {
TjProject byId = projectService.getById(remark.getProId());
- if(null !=byId){
+ if (null != byId) {
stringBuilder.append(byId.getProName()).append(";");
}
@@ -1574,7 +1642,7 @@
}
//宸叉(鍗曚釜瀛樺叆)0鏈,1宸叉
- public void getDgYjAjaxResult(Long orderId,Long ksId) {
+ public void getDgYjAjaxResult(Long orderId, Long ksId) {
if (null != orderId) {
TjOrder order = orderService.getById(orderId);
if (null != order) {
@@ -1585,8 +1653,8 @@
TjCustomer customer = tjCustomerService.getById(order.getUserId());
List<TjOrderDetail> lists = tjOrderDetailService.list(qww);
if (null == lists || lists.size() == 0) {
- redisCache.deleteCacheMapValue("ks"+ksId+customer.getCusId(),"1");
- redisCache.setCacheMapValue("ks:"+ksId+":"+customer.getCusId(),"0",customer);
+ redisCache.deleteCacheMapValue("ks" + ksId + customer.getCusId(), "1");
+ redisCache.setCacheMapValue("ks:" + ksId + ":" + customer.getCusId(), "0", customer);
}
if (null != customer) {
//閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
@@ -1624,67 +1692,67 @@
customer.setNotCheckeds(String.valueOf(stringBuilder));
if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
}
- redisCache.setCacheMapValue("ks:"+ksId+":"+customer.getCusId(),"1",customer);
+ redisCache.setCacheMapValue("ks:" + ksId + ":" + customer.getCusId(), "1", customer);
}
}
}
-}
+ }
//鏈(鍗曚釜瀛樺叆)0鏈,1宸叉
- public void getDgWjAjaxResult(Long orderId,Long ksId) {
- if (null != orderId) {
- TjOrder order = orderService.getById(orderId);
- if (null == order) {
- TjCustomer customer = tjCustomerService.getById(order.getUserId());
- if (null != customer) {
- LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
- qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
- qww.isNotNull(TjOrderDetail::getFlowingWaterId);
- List<TjOrderDetail> lists = tjOrderDetailService.list(qww);
- if (null != lists) {
- //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
- for (TjOrderDetail tjOrderDetail11 : lists) {
- customer.setIsPositive(tjOrderDetail11.getIsPositive());
- if (tjOrderDetail11.getIsPositive()==1){
- break;
- }
+ public void getDgWjAjaxResult(Long orderId, Long ksId) {
+ if (null != orderId) {
+ TjOrder order = orderService.getById(orderId);
+ if (null == order) {
+ TjCustomer customer = tjCustomerService.getById(order.getUserId());
+ if (null != customer) {
+ LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
+ qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
+ qww.isNotNull(TjOrderDetail::getFlowingWaterId);
+ List<TjOrderDetail> lists = tjOrderDetailService.list(qww);
+ if (null != lists) {
+ //閬嶅巻椤圭洰 鍒ゆ柇鏄惁鏈夐噸澶ч槼鎬� 鏍囪
+ for (TjOrderDetail tjOrderDetail11 : lists) {
+ customer.setIsPositive(tjOrderDetail11.getIsPositive());
+ if (tjOrderDetail11.getIsPositive() == 1) {
+ break;
}
}
-
- customer.setCusName(hideCusName(customer.getCusName()));
- customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
- customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
-
- if (order.getTjType().equals("1")) {
- customer.setTjType("鍥綋");
- }
- if (order.getTjType().equals("2")) {
- customer.setTjType("涓汉");
- }
- customer.setTjTime(order.getCreateTime());
- customer.setTjNumber(order.getTjNumber());
- customer.setOrderId(order.getOrderId());
- customer.setIsHz(order.getIsHz());
- customer.setTjCategory(order.getTjCategory());
- customer.setTjStatus(0L);
- LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
- wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
- wq.in(TjOrderRemark::getType, 0, 3);
- List<TjOrderRemark> list = orderRemarkService.list(wq);
- if (null != list && list.size() > 0) {
- StringBuilder stringBuilder = new StringBuilder();
- for (TjOrderRemark remark : list) {
- TjProject byId = projectService.getById(remark.getProId());
- stringBuilder.append(byId.getProName()).append(";");
- }
- customer.setNotCheckeds(String.valueOf(stringBuilder));
- if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
- }
-// redisCache.setCacheMapValue("ks"+ksId+":"+customer.getCusId(),"1",customer);
- redisCache.setCacheMapValue("ks"+ksId+":"+customer.getCusId(),"0",customer);
}
+
+ customer.setCusName(hideCusName(customer.getCusName()));
+ customer.setCusPhone(hidePhoneNum(customer.getCusPhone()));
+ customer.setCusIdcard(hideIdCardNum(customer.getCusIdcard()));
+
+ if (order.getTjType().equals("1")) {
+ customer.setTjType("鍥綋");
+ }
+ if (order.getTjType().equals("2")) {
+ customer.setTjType("涓汉");
+ }
+ customer.setTjTime(order.getCreateTime());
+ customer.setTjNumber(order.getTjNumber());
+ customer.setOrderId(order.getOrderId());
+ customer.setIsHz(order.getIsHz());
+ customer.setTjCategory(order.getTjCategory());
+ customer.setTjStatus(0L);
+ LambdaQueryWrapper<TjOrderRemark> wq = new LambdaQueryWrapper<>();
+ wq.eq(TjOrderRemark::getTjNumber, order.getTjNumber());
+ wq.in(TjOrderRemark::getType, 0, 3);
+ List<TjOrderRemark> list = orderRemarkService.list(wq);
+ if (null != list && list.size() > 0) {
+ StringBuilder stringBuilder = new StringBuilder();
+ for (TjOrderRemark remark : list) {
+ TjProject byId = projectService.getById(remark.getProId());
+ stringBuilder.append(byId.getProName()).append(";");
+ }
+ customer.setNotCheckeds(String.valueOf(stringBuilder));
+ if (null == customer.getNotCheckeds()) customer.setNotCheckeds("鍏ㄩ儴宸叉");
+ }
+// redisCache.setCacheMapValue("ks"+ksId+":"+customer.getCusId(),"1",customer);
+ redisCache.setCacheMapValue("ks" + ksId + ":" + customer.getCusId(), "0", customer);
}
+ }
}
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSurveyTemplateController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSurveyTemplateController.java
index 4d66e1c..563b4c1 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSurveyTemplateController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjSurveyTemplateController.java
@@ -328,9 +328,9 @@
@Log(title = "闂嵎妯℃澘", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody TjSurveyTemplate tjSurveyTemplate) {
- TjSurveyTemplate byId = tjSurveyTemplateService.selectTemplateByTjCategory(tjSurveyTemplate.getTempType());
- if(null !=byId){
- return AjaxResult.error("璇ョ被鍨嬫ā鏉垮凡瀛樺湪 涓嶅彲閲嶅鍒涘缓!!!");
+ TjSurveyTemplate byId = tjSurveyTemplateService.selectTemplateByMid1(tjSurveyTemplate.getMid());
+ if(null ==byId){
+ return AjaxResult.error("璇ユā鏉夸笉瀛樺湪!!!");
}
return toAjax(tjSurveyTemplateService.updateTjSurveyTemplate(tjSurveyTemplate));
}
--
Gitblit v1.8.0