From c976a54131a31143c174c475c8050427946eb4a8 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 01 七月 2024 16:16:10 +0800
Subject: [PATCH] 修复箭头问题增加单位返回
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 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 71badca..79aed1f 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
@@ -318,6 +318,7 @@
@GetMapping("/dataSynchronization")
@ApiOperation(value = "鍚屾sql server鏁版嵁鍒版湰鍦版暟鎹簱鏁版嵁鎺ュ彛")
@RepeatSubmit
+ @Transactional
public AjaxResult dataSynchronization(@RequestParam String tjNumber) {
//鏍规嵁閰嶇疆璋冨彇瀛樺偍杩囩▼ 灏嗕复鏃惰〃鏁版嵁瀛樺叆棰勭害琛�2023.12.12
final String getInfoFromSqlData = configService.selectConfigByKey("getInfoFromSqlData");
@@ -356,13 +357,21 @@
List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
if(null !=baoGaoDans && baoGaoDans.size()>0){
+
+// 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());
+// }
+// }
// for (String baoGaoDan : baoGaoDans) {
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("ksrq",DateUtil.format(DateUtil.beginOfDay(order.getCreateTime()), "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);
@@ -378,7 +387,8 @@
JSONObject jsonObject = (JSONObject)datum;
LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(order.getCardId(), jsonObject.getStr("JYBGID"));
if(null !=jybgid){
- continue;
+ ltkjHysqdService.deletedLtkjHysqdByTjhAndTmh(order.getCardId(),jsonObject.getStr("JYBGID"));
+ ltkjHybgdService.deletedLtkjHybgdByTjhAndTmh(jybgid.getTmh());
}
LtkjHysqd hysqd=new LtkjHysqd();
hysqd.setTjh(order.getCardId());
@@ -697,6 +707,9 @@
detailService.removeById(tjOrderDetail.getOrderDetailId());
} else {
tjOrderDetail.setProject(byId);
+ String metering = byId.getProMetering();
+ if (StrUtil.isNotBlank(metering))
+ tjOrderDetail.setUnit(metering);
}
List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
if (list2.size() == 0) {
@@ -774,6 +787,9 @@
for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
if(remark.getProId().equals(tjOrderDetail.getProId())){
String ckfw = tjOrderDetail.getStanId();
+ if (StrUtil.isNotBlank(tjOrderDetail.getProAdvice())){
+ ckfw = ckfw.replace(tjOrderDetail.getProAdvice().trim(),"");
+ }
if (StrUtil.isNotBlank(ckfw)) {
try {
Integer.parseInt(tjOrderDetail.getYcbz());
@@ -789,7 +805,9 @@
}else {
tjOrderDetail.setYcbz("");
}
- } catch (NumberFormatException ignored) { }
+ } catch (NumberFormatException ignored) {
+ ignored.printStackTrace();
+ }
}
if(null !=tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")){
tjOrderDetail.setProResult(tjOrderDetail.getProResult()+" ["+tjOrderDetail.getYcbz()+"]");
--
Gitblit v1.8.0