From 6d09f4ac6ee4718acd131f234f24ad1ac3c2ce3c Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 19 六月 2024 12:11:36 +0800
Subject: [PATCH] zjh 本地 2024/06/19 --1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 194 +++++++++++++++++++++++++++++++++++++----------
1 files changed, 151 insertions(+), 43 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 8ce2102..bb4c122 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -2,6 +2,9 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
+import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -25,9 +28,11 @@
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysUserService;
+import com.ltkj.web.controller.his.HisApiMethodService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
+import lombok.var;
import org.aspectj.weaver.AjAttribute;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -95,6 +100,9 @@
private LtkjHybgdService ltkjHybgdService;
@Resource
private LtkjHysqdService ltkjHysqdService;
+ @Autowired
+ private HisApiMethodService controller;
+
@GetMapping("/getOperationPermissionsByTjNum")
@@ -269,7 +277,7 @@
@ApiParam(value = "鐘舵�� 0鍚屾剰 1鎷掔粷 榛樿鍚屾剰") @RequestParam(defaultValue = "0") Integer status,
@ApiParam(value = "椹冲洖鐞嗙敱") @RequestParam(required = false) String remark) {
int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
- if (num > 0) return AjaxResult.error("璇峰厛鍚屾浣撴椤圭洰!");
+ if (num > 0) return AjaxResult.error("璇锋鏌ユ槸鍚﹀瓨鍦ㄦ湭妫�鎴栧欢鏈熼」鐩�");
if (null != tjNumber) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -311,28 +319,15 @@
public AjaxResult dataSynchronization(@RequestParam String tjNumber) {
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
- if ("Y".equals(getInfoFromSqlData)) {
- TjOrder order = orderService.getOrderByTjNum(tjNumber);
- if (null != order) {
- List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
- if (one != null && one.size() > 0) {
- for (LtkjHysqd ltkjHysqd : one) {
-// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- LtkjHysqd hysqd = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
- if (hysqd == null) {
- ltkjHysqdService.save(ltkjHysqd);
- DynamicDataSourceContextHolder.clearDataSourceType();
- List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh());
- if (one1 != null && one1.size() > 0) {
- DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
- ltkjHybgdService.saveBatch(one1);
- DynamicDataSourceContextHolder.clearDataSourceType();
- }
- }
- }
- }
-// List<LtkjExamJcsqd> one2 = testMapper.getExamJcsqdTmh(tjNumber);
+ final String sfkqdyhis = configService.selectConfigByKey("sfkqdyhis");
+ TjOrder order = orderService.getOrderByTjNum(tjNumber);
+ if(null !=order){
+
+ //寮�鍚瓧鍏稿脊绐�
+ if ("Y".equals(getInfoFromSqlData)) {
+ tbhyxm(order);
+ // List<LtkjExamJcsqd> one2 = testMapper.getExamJcsqdTmh(tjNumber);
// if (one2 != null && one2.size() > 0) {
// DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
// ltkjExamJcsqdService.saveBatch(one2);
@@ -351,9 +346,128 @@
//鍚屾妫�鏌ラ」鐩�
testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
asyncService.updateCheckType(order.getTjNumber());
+
+ }
+
+ //寮�鍚拰his瀵规帴
+ if(null !=sfkqdyhis && sfkqdyhis.equals("Y")){
+
+ String baoGaoDan = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
+ if(null !=baoGaoDan){
+ Date dates = new Date();
+ Map<String,Object> map=new HashMap<>();
+ map.put("his_registration_id",order.getCardId());
+ map.put("ksbm","");
+ map.put("pationid","");
+ map.put("ksrq",DateUtil.format(DateUtil.beginOfDay(dates), "yyyy-MM-dd HH:mm:ss"));
+ map.put("jsrq",DateUtil.format(DateUtil.endOfDay(dates), "yyyy-MM-dd HH:mm:ss"));
+ map.put("pagecount",10);
+ map.put("page",1);
+ AjaxResult result = controller.Getlabreportinfo(map);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if(null ==code || !code.equals("0")){
+ return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏃犵粨鏋�,璇风◢鍚庡悓姝�!!!");
+ }
+ JSONArray data = object.getJSONArray("ResultData");
+ for (Object datum : data) {
+ JSONObject jsonObject = (JSONObject)datum;
+ LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID"));
+ if(null !=jybgid){
+ continue;
+ }
+ LtkjHysqd hysqd=new LtkjHysqd();
+ hysqd.setTjh(order.getCardId());
+ hysqd.setTmh(jsonObject.getStr("JYBGID"));
+ hysqd.setBbbh(jsonObject.getStr("BBDM"));
+ hysqd.setBbmc(jsonObject.getStr("BBMC"));
+ hysqd.setXmid(jsonObject.getStr("JYXMDM"));
+ hysqd.setXmmc(jsonObject.getStr("JYXMMC"));
+ hysqd.setSqsj(jsonObject.getStr("SQRQ"));
+ hysqd.setSqys(jsonObject.getStr("SQRBH"));
+ hysqd.setJgsj(jsonObject.getStr("JYBGRQ"));
+ hysqd.setSqrxm(jsonObject.getStr("SQRXM"));
+ hysqd.setSqdh(jsonObject.getStr("SQDBH"));
+ if (ltkjHysqdService.save(hysqd)) {
+ Map<String,Object> hashMap=new HashMap<>();
+ hashMap.put("jybgid",hysqd.getTmh());
+ AjaxResult bgdres = controller.Getlabdetailinfo(hashMap);
+ String result2 = getAjaxResult(bgdres);
+ JSONObject object1 = getJSONObject(result2);
+ String code1 = object1.getStr("ResultCode");
+ if(null ==code1 || !code1.equals("0")){
+ return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏃犵粨鏋�,璇风◢鍚庡悓姝�!!!");
+ }
+ JSONArray datas = object1.getJSONArray("ResultData");
+ for (Object o : datas) {
+ JSONObject js = (JSONObject)o;
+// ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(jsonObject.getStr("JYBGID"));
+ LtkjHybgd bgd=new LtkjHybgd();
+ bgd.setTmh(hysqd.getTmh());
+ bgd.setJcxmid(js.getStr("JCZBDM"));
+ bgd.setJcxm(js.getStr("JCZBMC"));
+ bgd.setTdh(js.getStr(""));
+ bgd.setJyjg(js.getStr("JCZBJG"));
+ bgd.setJgdw(js.getStr("JLDW"));
+ bgd.setFwzdz(js.getStr(""));
+ bgd.setFwzgz(js.getStr(""));
+ bgd.setFwz(js.getStr("CKZFW"));
+ bgd.setJysj(js.getStr("BGRQ"));
+ bgd.setJyys(js.getStr("JCRBH"));
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShys(js.getStr("SHRBH"));
+ bgd.setYcbz(js.getStr("YCTS"));
+// bgd.setTpurl(js.getStr(""));
+ ltkjHybgdService.save(bgd);
+ }
+ }
+ }
+ //鍚屾鍖栭獙椤圭洰
+ testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ //鍚屾妫�鏌ラ」鐩�
+ testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ asyncService.updateCheckType(order.getTjNumber());
}
+
+
}
return AjaxResult.success("鍚屾鎴愬姛");
+ }
+ return AjaxResult.error();
+ }
+
+ //灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
+ public JSONObject getJSONObject(String builder) {
+ String Response = JSONUtil.parseObj(builder).getStr("Response");
+ return JSONUtil.parseObj(Response);
+ }
+
+ //鑾峰彇鏂规硶杩斿洖鍊间俊鎭�
+ public String getAjaxResult(AjaxResult result) {
+ return result.get("data").toString();
+ }
+
+ private void tbhyxm(TjOrder order) {
+ List<LtkjHysqd> one = testMapper.getHysqdByTmh(order.getCardId());
+ if (one != null && one.size() > 0) {
+ for (LtkjHysqd ltkjHysqd : one) {
+ ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
+ ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(ltkjHysqd.getTmh());
+ LtkjHysqd hysqd = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(ltkjHysqd.getTjh(), ltkjHysqd.getTmh());
+ if (hysqd == null) {
+ ltkjHysqdService.save(ltkjHysqd);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ List<LtkjHybgd> one1 = testMapper.getHybgdByTmh(ltkjHysqd.getTmh());
+ if (one1 != null && one1.size() > 0) {
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
+ ltkjHybgdService.saveBatch(one1);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ }
+ }
+ }
+ }
}
@@ -460,6 +574,7 @@
// }
// return getResult(page, pageSize, orderList, customerList, map);
// }
+
String value = String.valueOf(compId);
if (tjNumber == null) tjNumber = "";
if (compId == null) value = "";
@@ -561,12 +676,10 @@
continue;
}
-
//鍒ゆ柇璇ラ」鐩槸鍚︽楠岀椤圭洰 2024/2/28g
if (project.getDeptId() == 241) {
continue;
}
-
if (null != project) {
parent.put("parent", project.getProName());
@@ -638,7 +751,10 @@
if (one == null) {
return AjaxResult.error("鏆傛棤鏁版嵁锛侊紒");
}
- TjCustomer customer = customerService.getById(one.getUserId());
+ final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
+ if(null !=getInfoFromSqlData && getInfoFromSqlData.equals("Y"))
+ tbhyxm(one);
+// TjCustomer customer = customerService.getById(one.getUserId());
List<TjOrderRemark> remarkList = orderRemarkService.addHuaYanTable(tjNumber);
List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanTable(tjNumber);
@@ -649,27 +765,16 @@
parent.put("checkAdvice", one.getCheckAdvice());
parent.put("parent", remark.getProName());
parent.put("parentId", remark.getProId().toString());
-
+ List<TjOrderDetail> dels=new ArrayList<>();
if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
- final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
- if (null == byId) {
- detailService.removeById(tjOrderDetail.getOrderDetailId());
- } else {
- tjOrderDetail.setProject(byId);
- }
- List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
- if (list2.size() == 0) {
- tjOrderDetail.setStandard(new TjStandard());
- } else if (list2.size() == 1) {
- tjOrderDetail.setStandard(list2.get(0));
- } else {
- final int ageType = StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday()));
- TjStandard tjStandard1 = tjStandardService.getListBySexAndType(customer.getCusSex(), ageType, String.valueOf(tjOrderDetail.getProId()));
- tjOrderDetail.setStandard(tjStandard1);
+ if(remark.getProId().equals(tjOrderDetail.getProId())){
+ if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
+ tjOrderDetail.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");
+ }
+ dels.add(tjOrderDetail);
}
}
-
String summary = remark.getSummary();
if (null != summary) {
String[] split = summary.split(";");
@@ -677,7 +782,10 @@
} else {
parent.put("parentAdvice", null);
}
- parent.put("sons", tjOrderDetails);
+ if(dels.size()==0){
+ continue;
+ }
+ parent.put("sons", dels);
parent.put("remark", remark.getRemark());
if (remark.getDoctorName() != null && null != userService.getById(remark.getDoctorName())) {
parent.put("doctorName", userService.getById(remark.getDoctorName()).getNickName());
--
Gitblit v1.8.0