From d7d79867f7ccd9b4d13fe7b9e5f5850ebf794639 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 09 七月 2024 13:36:06 +0800
Subject: [PATCH] zjh 2024/07/9-1
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 84 ++++++++++++++--------------
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 34 +++++++++++
ltkj-admin/src/main/resources/application.yml | 2
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java | 5 +
4 files changed, 81 insertions(+), 44 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index a7a40fe..4b21bf8 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1630,50 +1630,50 @@
tjOrderDetail.setRulesList(rulesList);
//鏌ユ爣鍑嗗拰鍗曚綅----start
- List<TjStandard> list26 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
- if (list26.size() == 0) {
- project.setProMetering("/");
- project.setProScope("/");
- } else if (list26.size() == 1) {
- project.setProMetering(list26.get(0).getCompany() == null ? " " : list26.get(0).getCompany());
- project.setProScope((list26.get(0).getTjStandardLtValue() == null ? " " : list26.get(0).getTjStandardLtValue()) + "-" + (list26.get(0).getTjStandardGtValue() == null ? " " : list26.get(0).getTjStandardGtValue()));
- } else {
- Long cusSex = customer.getCusSex();
- Date cusBrithday = customer.getCusBrithday();
- int age = DateUtil.ageOfNow(cusBrithday);
- for (TjStandard tjStandard : list26) {
- LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
- if (tjStandard.getTjSex() != null) {
- wq8.eq(TjStandard::getTjSex, cusSex);
- }
- if (tjStandard.getTjType() != null) {
- wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(age));
- }
- TjStandard standard = tjStandardService.getOne(wq8);
- project.setProMetering(standard.getCompany());
- project.setProScope((standard.getTjStandardLtValue() == null ? " " : standard.getTjStandardLtValue()) + "-" + (standard.getTjStandardGtValue() == null ? " " : standard.getTjStandardGtValue()));
- }
- }
+// List<TjStandard> list26 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
+// if (list26.size() == 0) {
+// project.setProMetering("/");
+// project.setProScope("/");
+// } else if (list26.size() == 1) {
+// project.setProMetering(list26.get(0).getCompany() == null ? " " : list26.get(0).getCompany());
+// project.setProScope((list26.get(0).getTjStandardLtValue() == null ? " " : list26.get(0).getTjStandardLtValue()) + "-" + (list26.get(0).getTjStandardGtValue() == null ? " " : list26.get(0).getTjStandardGtValue()));
+// } else {
+// Long cusSex = customer.getCusSex();
+// Date cusBrithday = customer.getCusBrithday();
+// int age = DateUtil.ageOfNow(cusBrithday);
+// for (TjStandard tjStandard : list26) {
+// LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
+// if (tjStandard.getTjSex() != null) {
+// wq8.eq(TjStandard::getTjSex, cusSex);
+// }
+// if (tjStandard.getTjType() != null) {
+// wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(age));
+// }
+// TjStandard standard = tjStandardService.getOne(wq8);
+// project.setProMetering(standard.getCompany());
+// project.setProScope((standard.getTjStandardLtValue() == null ? " " : standard.getTjStandardLtValue()) + "-" + (standard.getTjStandardGtValue() == null ? " " : standard.getTjStandardGtValue()));
+// }
+// }
//鏌ユ爣鍑嗗拰鍗曚綅-----end
tjOrderDetail.setProject(project);
- List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(project.getProId()));
- if (list2.size() == 0) {
- tjOrderDetail.setStandard(null);
- } else if (list2.size() == 1) {
- tjOrderDetail.setStandard(list2.get(0));
- } else {
- for (TjStandard tjStandard : list2) {
- LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
- if (tjStandard.getTjSex() != null) {
- wq8.eq(TjStandard::getTjSex, customer.getCusSex());
- }
- if (tjStandard.getTjType() != null) {
- wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday())));
- }
- TjStandard standard = tjStandardService.getOne(wq8);
- tjOrderDetail.setStandard(standard);
- }
- }
+// List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(project.getProId()));
+// if (list2.size() == 0) {
+// tjOrderDetail.setStandard(null);
+// } else if (list2.size() == 1) {
+// tjOrderDetail.setStandard(list2.get(0));
+// } else {
+// for (TjStandard tjStandard : list2) {
+// LambdaQueryWrapper<TjStandard> wq8 = new LambdaQueryWrapper<>();
+// if (tjStandard.getTjSex() != null) {
+// wq8.eq(TjStandard::getTjSex, customer.getCusSex());
+// }
+// if (tjStandard.getTjType() != null) {
+// wq8.eq(TjStandard::getTjType, StringUtils.getAgeType(DateUtil.ageOfNow(customer.getCusBrithday())));
+// }
+// TjStandard standard = tjStandardService.getOne(wq8);
+// tjOrderDetail.setStandard(standard);
+// }
+// }
if (null != remark.getDoctorName()) {
//lg0412
SysUser byId = userService.getById(remark.getDoctorName());
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 967e833..3286075 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
@@ -436,6 +436,36 @@
ltkjHybgdService.save(bgd);
}
}
+
+ Map<String, Object> fbhashMap = new HashMap<>();
+ fbhashMap.put("jybgid", hysqd.getTmh());
+ AjaxResult fbres = controller.Getlabgermrepinfo(fbhashMap);
+ String ajaxResult = getAjaxResult(fbres);
+ JSONObject fbobject = getJSONObject(ajaxResult);
+ String fbcode = fbobject.getStr("ResultCode");
+ if (null != fbcode && fbcode.equals("0")) {
+ JSONArray datas = fbobject.getJSONArray("ResultData");
+ for (Object o : datas) {
+ JSONObject js = (JSONObject) o;
+ LtkjHybgd bgd = new LtkjHybgd();
+ bgd.setTmh(hysqd.getTmh());
+ bgd.setJcxmid(hysqd.getXmid());
+ bgd.setJcxm(hysqd.getXmmc());
+ bgd.setTdh(js.getStr(""));
+ bgd.setJyjg(js.getStr("JCJG"));
+ bgd.setJgdw("/");
+ bgd.setFwzdz("/");
+ bgd.setFwzgz("/");
+ bgd.setFwz("/");
+ bgd.setJysj(js.getStr("BGRQ"));
+ bgd.setJyys(hysqd.getSqrxm());
+ bgd.setShsj(js.getStr("BGRQ"));
+ bgd.setShys(hysqd.getShrdm());
+ bgd.setShysmc(hysqd.getShrxm());
+ ltkjHybgdService.save(bgd);
+ }
+ }
+
}
}
@@ -932,12 +962,13 @@
parent.put("parent", remark.getProName());
parent.put("parentId", remark.getProsId());
parent.put("xmlb", remark.getXmlb());
+ parent.put("", remark.getXmlb());
List<TjOrderDetail> dels = new ArrayList<>();
if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
String ckfw = tjOrderDetail.getStanId();
- if (StrUtil.isNotBlank(tjOrderDetail.getProAdvice())) {
+ if (null !=ckfw && StrUtil.isNotBlank(tjOrderDetail.getProAdvice())) {
ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(), "");
}
if (StrUtil.isNotBlank(ckfw)) {
@@ -977,6 +1008,7 @@
}
parent.put("sons", dels);
parent.put("remark", remark.getRemark());
+ parent.put("jgbx", remark.getJgbx());
if (remark.getDoctorName() != null) {
parent.put("doctorName", remark.getDoctorName());
}
diff --git a/ltkj-admin/src/main/resources/application.yml b/ltkj-admin/src/main/resources/application.yml
index 64865e4..7fbd094 100644
--- a/ltkj-admin/src/main/resources/application.yml
+++ b/ltkj-admin/src/main/resources/application.yml
@@ -4,4 +4,4 @@
#test 娉惧窛鍘块儴缃叉祴璇曠幆澧冧娇鐢�
spring:
profiles:
- active: test
\ No newline at end of file
+ active: dev
\ No newline at end of file
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
index 39e9ba8..036c0a4 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOrderRemark.java
@@ -127,6 +127,11 @@
private String xmlb;
+ @ApiModelProperty(value = "缁撴灉琛ㄧ幇")
+ @TableField(exist = false)
+ private String jgbx;
+
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.8.0