From 524a0867c6e8343607d343a4f708498c21baf9d4 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 28 二月 2025 15:25:34 +0800
Subject: [PATCH] 修改药品处方从表里拿处方类型以及sqlserver连接去除ssl
---
ltkj-hosp/src/main/resources/mapper/TjOutpinmedicXmMapper.xml | 3
ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinmedicapplyDetilsDto.java | 1
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 174 +++++++++++++-----
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOutpinmedicXm.java | 4
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 3
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 343 ++++++++++++++++++++++++++-----------
ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java | 2
7 files changed, 370 insertions(+), 160 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
index 33ec23a..8761b80 100644
--- 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
@@ -297,6 +297,7 @@
detilsDto.setYpmc(i.getYpmc());
detilsDto.setFzbl(i.getFzbl());
detilsDto.setZh(i.getZh());
+ detilsDto.setCflx(i.getCflx());
outpinmedicapplyDetilsDtos.add(detilsDto);
});
}
@@ -411,6 +412,7 @@
detilsDto.setYpmc(i.getYpmc());
detilsDto.setFzbl(i.getFzbl());
detilsDto.setZh(i.getZh());
+ detilsDto.setCflx(i.getCflx());
outpinmedicapplyDetilsDtos.add(detilsDto);
});
}
@@ -536,6 +538,7 @@
detilsDto.setYpmc(i.getYpmc());
detilsDto.setFzbl(i.getFzbl());
detilsDto.setZh(i.getZh());
+ detilsDto.setCflx(i.getCflx());
outpinmedicapplyDetilsDtos.add(detilsDto);
});
}
@@ -582,64 +585,129 @@
}
}
- //鑽搧鐢宠
+ //鑽搧鐢宠鍘熺増
+// if(!outpinmedicapplyDetilsDtos.isEmpty()){
+// OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
+// dto1.setHisRegistrationId(cardId);
+// dto1.setSfzh(customer.getCusIdcard());
+// dto1.setSqysbm(ysbm);
+// dto1.setMzksbm(dept);
+// dto1.setSjrq(date);
+// String yfbm = configService.selectConfigByKey("chufang_yfbm");
+// String mzzd = configService.selectConfigByKey("chufang_mzzd");
+// String czybm = configService.selectConfigByKey("chufang_czybm");
+// String czyksbm = configService.selectConfigByKey("chufang_czyksbm");
+// String cflxbm = configService.selectConfigByKey("chufang_cflxbm");
+// if (czybm.equalsIgnoreCase("N"))
+// dto1.setCzybm(ysbm);
+// else dto1.setCzybm(czybm);
+// if (czyksbm.equalsIgnoreCase("N"))
+// dto1.setCzyksbm(dept);
+// else dto1.setCzyksbm(czyksbm);
+// dto1.setCflxbm(cflxbm);
+// if (yfbm.equalsIgnoreCase("N"))
+// dto1.setYfbm("1");
+// else dto1.setYfbm(yfbm);
+// dto1.setFyts("1");
+// if (mzzd.equalsIgnoreCase("N"))
+// dto1.setMzzd("");
+// else dto1.setMzzd(mzzd);
+// dto1.setDetails(outpinmedicapplyDetilsDtos);
+// AjaxResult result = controller.Outpinmedicapply(dto1);
+// String result1 = getAjaxResult(result);
+// JSONObject object = getJSONObject(result1);
+// String code = object.getStr("ResultCode");
+// if(null !=code && code.equals("0")){
+// JSONObject resultData = object.getJSONObject("ResultData");
+//// Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
+// String cfh = resultData.getStr("cfh");
+// log.info("鑽搧鐢宠鍚庣殑澶勬柟鍙锋槸: "+cfh+" outpinmedicapplyDetilsDtos 閲岄潰鐨勫�间负: "+outpinmedicapplyDetilsDtos.toString());
+// for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
+// TjCf cf=new TjCf();
+// cf.setCardId(cardId);
+// cf.setSfzh(customer.getCusIdcard());
+// cf.setCfh(cfh);
+// cf.setSqysbm(ysbm);
+// cf.setSqysxm(ysmc);
+// cf.setMzksbn(dept);
+// cf.setSqrq(date);
+// cf.setCzybm(ysbm);
+// cf.setYpbm(detilsDto.getYpbm());
+// cf.setYpmc(detilsDto.getYpmc());
+// cf.setSl(String.valueOf(detilsDto.getSl()));
+// cf.setDj(String.valueOf(detilsDto.getDj()));
+// cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
+// cf.setPj(String.valueOf(detilsDto.getPj()));
+// cf.setJj(String.valueOf(detilsDto.getJj()));
+// cf.setCreateTime(new Date());
+// cfService.save(cf);
+// }
+// }
+// }
+
+
+ /**
+ * 鑽搧鐢宠 澶勬柟绫诲瀷缁存姢鍦ㄨ嵂鍝佽〃
+ */
if(!outpinmedicapplyDetilsDtos.isEmpty()){
- OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
- dto1.setHisRegistrationId(cardId);
- dto1.setSfzh(customer.getCusIdcard());
- dto1.setSqysbm(ysbm);
- dto1.setMzksbm(dept);
- dto1.setSjrq(date);
String yfbm = configService.selectConfigByKey("chufang_yfbm");
String mzzd = configService.selectConfigByKey("chufang_mzzd");
String czybm = configService.selectConfigByKey("chufang_czybm");
String czyksbm = configService.selectConfigByKey("chufang_czyksbm");
- String cflxbm = configService.selectConfigByKey("chufang_cflxbm");
- if (czybm.equalsIgnoreCase("N"))
- dto1.setCzybm(ysbm);
- else dto1.setCzybm(czybm);
- if (czyksbm.equalsIgnoreCase("N"))
- dto1.setCzyksbm(dept);
- else dto1.setCzyksbm(czyksbm);
- dto1.setCflxbm(cflxbm);
- if (yfbm.equalsIgnoreCase("N"))
- dto1.setYfbm("1");
- else dto1.setYfbm(yfbm);
- dto1.setFyts("1");
- if (mzzd.equalsIgnoreCase("N"))
- dto1.setMzzd("");
- else dto1.setMzzd(mzzd);
- dto1.setDetails(outpinmedicapplyDetilsDtos);
- AjaxResult result = controller.Outpinmedicapply(dto1);
- String result1 = getAjaxResult(result);
- JSONObject object = getJSONObject(result1);
- String code = object.getStr("ResultCode");
- if(null !=code && code.equals("0")){
- JSONObject resultData = object.getJSONObject("ResultData");
-// Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
- String cfh = resultData.getStr("cfh");
- log.info("鑽搧鐢宠鍚庣殑澶勬柟鍙锋槸: "+cfh+" outpinmedicapplyDetilsDtos 閲岄潰鐨勫�间负: "+outpinmedicapplyDetilsDtos.toString());
- for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
- TjCf cf=new TjCf();
- cf.setCardId(cardId);
- cf.setSfzh(customer.getCusIdcard());
- cf.setCfh(cfh);
- cf.setSqysbm(ysbm);
- cf.setSqysxm(ysmc);
- cf.setMzksbn(dept);
- cf.setSqrq(date);
- cf.setCzybm(ysbm);
- cf.setYpbm(detilsDto.getYpbm());
- cf.setYpmc(detilsDto.getYpmc());
- cf.setSl(String.valueOf(detilsDto.getSl()));
- cf.setDj(String.valueOf(detilsDto.getDj()));
- cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
- cf.setPj(String.valueOf(detilsDto.getPj()));
- cf.setJj(String.valueOf(detilsDto.getJj()));
- cf.setCreateTime(new Date());
- cfService.save(cf);
+// String cflxbm = configService.selectConfigByKey("chufang_cflxbm");
+ Map<String, List<OutpinmedicapplyDetilsDto>> listMap = outpinmedicapplyDetilsDtos.stream().collect(Collectors.groupingBy(OutpinmedicapplyDetilsDto::getCflx));
+ listMap.forEach((cflx, details) -> {
+ OutpinmedicapplyDto dto1 = new OutpinmedicapplyDto();
+ dto1.setHisRegistrationId(cardId);
+ dto1.setSfzh(customer.getCusIdcard());
+ dto1.setSqysbm(ysbm);
+ dto1.setMzksbm(dept);
+ dto1.setSjrq(date);
+ if (czybm.equalsIgnoreCase("N"))
+ dto1.setCzybm(ysbm);
+ else dto1.setCzybm(czybm);
+ if (czyksbm.equalsIgnoreCase("N"))
+ dto1.setCzyksbm(dept);
+ else dto1.setCzyksbm(czyksbm);
+ dto1.setCflxbm(cflx);
+ if (yfbm.equalsIgnoreCase("N"))
+ dto1.setYfbm("1");
+ else dto1.setYfbm(yfbm);
+ dto1.setFyts("1");
+ if (mzzd.equalsIgnoreCase("N"))
+ dto1.setMzzd("");
+ else dto1.setMzzd(mzzd);
+ dto1.setDetails(details);
+ AjaxResult result = controller.Outpinmedicapply(dto1);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (null != code && code.equals("0")) {
+ JSONObject resultData = object.getJSONObject("ResultData");
+ String cfh = resultData.getStr("cfh");
+ log.info("鑽搧鐢宠鍚庣殑澶勬柟鍙锋槸: " + cfh + " outpinmedicapplyDetilsDtos 閲岄潰鐨勫�间负: " + outpinmedicapplyDetilsDtos.toString());
+ for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
+ TjCf cf = new TjCf();
+ cf.setCardId(cardId);
+ cf.setSfzh(customer.getCusIdcard());
+ cf.setCfh(cfh);
+ cf.setSqysbm(ysbm);
+ cf.setSqysxm(ysmc);
+ cf.setMzksbn(dept);
+ cf.setSqrq(date);
+ cf.setCzybm(ysbm);
+ cf.setYpbm(detilsDto.getYpbm());
+ cf.setYpmc(detilsDto.getYpmc());
+ cf.setSl(String.valueOf(detilsDto.getSl()));
+ cf.setDj(String.valueOf(detilsDto.getDj()));
+ cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
+ cf.setPj(String.valueOf(detilsDto.getPj()));
+ cf.setJj(String.valueOf(detilsDto.getJj()));
+ cf.setCreateTime(new Date());
+ cfService.save(cf);
+ }
}
- }
+ });
}
return AjaxResult.success();
@@ -1515,6 +1583,7 @@
detilsDto.setYpmc(i.getYpmc());
detilsDto.setFzbl(i.getFzbl());
detilsDto.setZh(i.getZh());
+ detilsDto.setCflx(i.getCflx());
outpinmedicapplyDetilsDtos.add(detilsDto);
});
}
@@ -1623,6 +1692,7 @@
detilsDto.setYpmc(i.getYpmc());
detilsDto.setFzbl(i.getFzbl());
detilsDto.setZh(i.getZh());
+ detilsDto.setCflx(i.getCflx());
outpinmedicapplyDetilsDtos.add(detilsDto);
});
}
@@ -1744,6 +1814,7 @@
detilsDto.setYpmc(i.getYpmc());
detilsDto.setFzbl(i.getFzbl());
detilsDto.setZh(i.getZh());
+ detilsDto.setCflx(i.getCflx());
outpinmedicapplyDetilsDtos.add(detilsDto);
});
}
@@ -1790,64 +1861,128 @@
}
}
- //鑽搧鐢宠
+ //鑽搧鐢宠 鍘熺増
+// if(!outpinmedicapplyDetilsDtos.isEmpty()){
+// OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
+// dto1.setHisRegistrationId(cardId);
+// dto1.setSfzh(customer.getCusIdcard());
+// dto1.setSqysbm(ysbm);
+// dto1.setMzksbm(dept);
+// dto1.setSjrq(date);
+// String yfbm = configService.selectConfigByKey("chufang_yfbm");
+// String mzzd = configService.selectConfigByKey("chufang_mzzd");
+// String czybm = configService.selectConfigByKey("chufang_czybm");
+// String czyksbm = configService.selectConfigByKey("chufang_czyksbm");
+// String cflxbm = configService.selectConfigByKey("chufang_cflxbm");
+// if (czybm.equalsIgnoreCase("N"))
+// dto1.setCzybm(ysbm);
+// else dto1.setCzybm(czybm);
+// if (czyksbm.equalsIgnoreCase("N"))
+// dto1.setCzyksbm(dept);
+// else dto1.setCzyksbm(czyksbm);
+// dto1.setCflxbm(cflxbm);
+// if (yfbm.equalsIgnoreCase("N"))
+// dto1.setYfbm("1");
+// else dto1.setYfbm(yfbm);
+// dto1.setFyts("1");
+// if (mzzd.equalsIgnoreCase("N"))
+// dto1.setMzzd("");
+// else dto1.setMzzd(mzzd);
+// dto1.setDetails(outpinmedicapplyDetilsDtos);
+// AjaxResult result = controller.Outpinmedicapply(dto1);
+// String result1 = getAjaxResult(result);
+// JSONObject object = getJSONObject(result1);
+// String code = object.getStr("ResultCode");
+// if(null !=code && code.equals("0")){
+// JSONObject resultData = object.getJSONObject("ResultData");
+//// Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
+// String cfh = resultData.getStr("cfh");
+// log.info("鑽搧鐢宠鍚庣殑澶勬柟鍙锋槸: "+cfh+" outpinmedicapplyDetilsDtos 閲岄潰鐨勫�间负: "+outpinmedicapplyDetilsDtos.toString());
+// for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
+// TjCf cf=new TjCf();
+// cf.setCardId(cardId);
+// cf.setSfzh(customer.getCusIdcard());
+// cf.setCfh(cfh);
+// cf.setSqysbm(ysbm);
+// cf.setSqysxm(ysmc);
+// cf.setMzksbn(dept);
+// cf.setSqrq(date);
+// cf.setCzybm(ysbm);
+// cf.setYpbm(detilsDto.getYpbm());
+// cf.setYpmc(detilsDto.getYpmc());
+// cf.setSl(String.valueOf(detilsDto.getSl()));
+// cf.setDj(String.valueOf(detilsDto.getDj()));
+// cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
+// cf.setPj(String.valueOf(detilsDto.getPj()));
+// cf.setJj(String.valueOf(detilsDto.getJj()));
+// cf.setCreateTime(new Date());
+// cfService.save(cf);
+// }
+// }
+// }
+
+ /**
+ * 鑽搧鐢宠 澶勬柟绫诲瀷缁存姢鍦ㄨ嵂鍝佽〃
+ */
if(!outpinmedicapplyDetilsDtos.isEmpty()){
- OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
- dto1.setHisRegistrationId(cardId);
- dto1.setSfzh(customer.getCusIdcard());
- dto1.setSqysbm(ysbm);
- dto1.setMzksbm(dept);
- dto1.setSjrq(date);
String yfbm = configService.selectConfigByKey("chufang_yfbm");
String mzzd = configService.selectConfigByKey("chufang_mzzd");
String czybm = configService.selectConfigByKey("chufang_czybm");
String czyksbm = configService.selectConfigByKey("chufang_czyksbm");
- String cflxbm = configService.selectConfigByKey("chufang_cflxbm");
- if (czybm.equalsIgnoreCase("N"))
- dto1.setCzybm(ysbm);
- else dto1.setCzybm(czybm);
- if (czyksbm.equalsIgnoreCase("N"))
- dto1.setCzyksbm(dept);
- else dto1.setCzyksbm(czyksbm);
- dto1.setCflxbm(cflxbm);
- if (yfbm.equalsIgnoreCase("N"))
- dto1.setYfbm("1");
- else dto1.setYfbm(yfbm);
- dto1.setFyts("1");
- if (mzzd.equalsIgnoreCase("N"))
- dto1.setMzzd("");
- else dto1.setMzzd(mzzd);
- dto1.setDetails(outpinmedicapplyDetilsDtos);
- AjaxResult result = controller.Outpinmedicapply(dto1);
- String result1 = getAjaxResult(result);
- JSONObject object = getJSONObject(result1);
- String code = object.getStr("ResultCode");
- if(null !=code && code.equals("0")){
- JSONObject resultData = object.getJSONObject("ResultData");
-// Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
- String cfh = resultData.getStr("cfh");
- log.info("鑽搧鐢宠鍚庣殑澶勬柟鍙锋槸: "+cfh+" outpinmedicapplyDetilsDtos 閲岄潰鐨勫�间负: "+outpinmedicapplyDetilsDtos.toString());
- for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
- TjCf cf=new TjCf();
- cf.setCardId(cardId);
- cf.setSfzh(customer.getCusIdcard());
- cf.setCfh(cfh);
- cf.setSqysbm(ysbm);
- cf.setSqysxm(ysmc);
- cf.setMzksbn(dept);
- cf.setSqrq(date);
- cf.setCzybm(ysbm);
- cf.setYpbm(detilsDto.getYpbm());
- cf.setYpmc(detilsDto.getYpmc());
- cf.setSl(String.valueOf(detilsDto.getSl()));
- cf.setDj(String.valueOf(detilsDto.getDj()));
- cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
- cf.setPj(String.valueOf(detilsDto.getPj()));
- cf.setJj(String.valueOf(detilsDto.getJj()));
- cf.setCreateTime(new Date());
- cfService.save(cf);
+// String cflxbm = configService.selectConfigByKey("chufang_cflxbm");
+ Map<String, List<OutpinmedicapplyDetilsDto>> listMap = outpinmedicapplyDetilsDtos.stream().collect(Collectors.groupingBy(OutpinmedicapplyDetilsDto::getCflx));
+ listMap.forEach((cflx, details) -> {
+ OutpinmedicapplyDto dto1 = new OutpinmedicapplyDto();
+ dto1.setHisRegistrationId(cardId);
+ dto1.setSfzh(customer.getCusIdcard());
+ dto1.setSqysbm(ysbm);
+ dto1.setMzksbm(dept);
+ dto1.setSjrq(date);
+ if (czybm.equalsIgnoreCase("N"))
+ dto1.setCzybm(ysbm);
+ else dto1.setCzybm(czybm);
+ if (czyksbm.equalsIgnoreCase("N"))
+ dto1.setCzyksbm(dept);
+ else dto1.setCzyksbm(czyksbm);
+ dto1.setCflxbm(cflx);
+ if (yfbm.equalsIgnoreCase("N"))
+ dto1.setYfbm("1");
+ else dto1.setYfbm(yfbm);
+ dto1.setFyts("1");
+ if (mzzd.equalsIgnoreCase("N"))
+ dto1.setMzzd("");
+ else dto1.setMzzd(mzzd);
+ dto1.setDetails(details);
+ AjaxResult result = controller.Outpinmedicapply(dto1);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (null != code && code.equals("0")) {
+ JSONObject resultData = object.getJSONObject("ResultData");
+ String cfh = resultData.getStr("cfh");
+ log.info("鑽搧鐢宠鍚庣殑澶勬柟鍙锋槸: " + cfh + " outpinmedicapplyDetilsDtos 閲岄潰鐨勫�间负: " + outpinmedicapplyDetilsDtos.toString());
+ for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
+ TjCf cf = new TjCf();
+ cf.setCardId(cardId);
+ cf.setSfzh(customer.getCusIdcard());
+ cf.setCfh(cfh);
+ cf.setSqysbm(ysbm);
+ cf.setSqysxm(ysmc);
+ cf.setMzksbn(dept);
+ cf.setSqrq(date);
+ cf.setCzybm(ysbm);
+ cf.setYpbm(detilsDto.getYpbm());
+ cf.setYpmc(detilsDto.getYpmc());
+ cf.setSl(String.valueOf(detilsDto.getSl()));
+ cf.setDj(String.valueOf(detilsDto.getDj()));
+ cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
+ cf.setPj(String.valueOf(detilsDto.getPj()));
+ cf.setJj(String.valueOf(detilsDto.getJj()));
+ cf.setCreateTime(new Date());
+ cfService.save(cf);
+ }
}
- }
+ });
}
return AjaxResult.success();
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 3f840e6..6e660b0 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
@@ -2434,6 +2434,7 @@
detilsDto.setYpmc(i.getYpmc());
detilsDto.setFzbl(i.getFzbl());
detilsDto.setZh(i.getZh());
+ detilsDto.setCflx(i.getCflx());
outpinmedicapplyDetilsDtos.add(detilsDto);
});
}
@@ -2545,6 +2546,7 @@
detilsDto.setYpmc(i.getYpmc());
detilsDto.setFzbl(i.getFzbl());
detilsDto.setZh(i.getZh());
+ detilsDto.setCflx(i.getCflx());
outpinmedicapplyDetilsDtos.add(detilsDto);
});
}
@@ -2664,6 +2666,7 @@
detilsDto.setYpmc(i.getYpmc());
detilsDto.setFzbl(i.getFzbl());
detilsDto.setZh(i.getZh());
+ detilsDto.setCflx(i.getCflx());
outpinmedicapplyDetilsDtos.add(detilsDto);
});
}
@@ -2711,65 +2714,130 @@
}
}
- //鑽搧鐢宠
+ //鑽搧鐢宠 鍘熺増
+// if(!outpinmedicapplyDetilsDtos.isEmpty()){
+// OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
+// dto1.setHisRegistrationId(cardId);
+// dto1.setSfzh(customer.getCusIdcard());
+// dto1.setSqysbm(ysbm);
+// dto1.setMzksbm(dept);
+// dto1.setSjrq(date);
+// String yfbm = configService.selectConfigByKey("chufang_yfbm");
+// String mzzd = configService.selectConfigByKey("chufang_mzzd");
+// String czybm = configService.selectConfigByKey("chufang_czybm");
+// String czyksbm = configService.selectConfigByKey("chufang_czyksbm");
+// String cflxbm = configService.selectConfigByKey("chufang_cflxbm");
+// if (czybm.equalsIgnoreCase("N"))
+// dto1.setCzybm(ysbm);
+// else dto1.setCzybm(czybm);
+// if (czyksbm.equalsIgnoreCase("N"))
+// dto1.setCzyksbm(dept);
+// else dto1.setCzyksbm(dept);
+// dto1.setCflxbm(cflxbm);
+// if (yfbm.equalsIgnoreCase("N"))
+// dto1.setYfbm("1");
+// else dto1.setYfbm(yfbm);
+// dto1.setFyts("1");
+// if (mzzd.equalsIgnoreCase("N"))
+// dto1.setMzzd("");
+// else dto1.setMzzd(mzzd);
+// dto1.setDetails(outpinmedicapplyDetilsDtos);
+// AjaxResult result = controller.Outpinmedicapply(dto1);
+// String result1 = getAjaxResult(result);
+// JSONObject object = getJSONObject(result1);
+// String code = object.getStr("ResultCode");
+// if(null !=code && code.equals("0")){
+// JSONObject resultData = object.getJSONObject("ResultData");
+//// Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
+// String cfh = resultData.getStr("cfh");
+// log.info("鑽搧鐢宠鍚庣殑澶勬柟鍙锋槸: "+cfh+" outpinmedicapplyDetilsDtos 閲岄潰鐨勫�间负: "+outpinmedicapplyDetilsDtos.toString());
+// for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
+// TjCf cf=new TjCf();
+// cf.setJxbz(jxbz);
+// cf.setCardId(cardId);
+// cf.setSfzh(customer.getCusIdcard());
+// cf.setCfh(cfh);
+// cf.setSqysbm(ysbm);
+// cf.setSqysxm(ysmc);
+// cf.setMzksbn(dept);
+// cf.setSqrq(date);
+// cf.setCzybm(ysbm);
+// cf.setYpbm(detilsDto.getYpbm());
+// cf.setYpmc(detilsDto.getYpmc());
+// cf.setSl(String.valueOf(detilsDto.getSl()));
+// cf.setDj(String.valueOf(detilsDto.getDj()));
+// cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
+// cf.setPj(String.valueOf(detilsDto.getPj()));
+// cf.setJj(String.valueOf(detilsDto.getJj()));
+// cf.setCreateTime(new Date());
+// cfService.save(cf);
+// }
+// }
+// }
+
+
+ /**
+ * 鑽搧鐢宠 澶勬柟绫诲瀷缁存姢鍦ㄨ嵂鍝佽〃
+ */
if(!outpinmedicapplyDetilsDtos.isEmpty()){
- OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
- dto1.setHisRegistrationId(cardId);
- dto1.setSfzh(customer.getCusIdcard());
- dto1.setSqysbm(ysbm);
- dto1.setMzksbm(dept);
- dto1.setSjrq(date);
String yfbm = configService.selectConfigByKey("chufang_yfbm");
String mzzd = configService.selectConfigByKey("chufang_mzzd");
String czybm = configService.selectConfigByKey("chufang_czybm");
String czyksbm = configService.selectConfigByKey("chufang_czyksbm");
- String cflxbm = configService.selectConfigByKey("chufang_cflxbm");
- if (czybm.equalsIgnoreCase("N"))
- dto1.setCzybm(ysbm);
- else dto1.setCzybm(czybm);
- if (czyksbm.equalsIgnoreCase("N"))
- dto1.setCzyksbm(dept);
- else dto1.setCzyksbm(dept);
- dto1.setCflxbm(cflxbm);
- if (yfbm.equalsIgnoreCase("N"))
- dto1.setYfbm("1");
- else dto1.setYfbm(yfbm);
- dto1.setFyts("1");
- if (mzzd.equalsIgnoreCase("N"))
- dto1.setMzzd("");
- else dto1.setMzzd(mzzd);
- dto1.setDetails(outpinmedicapplyDetilsDtos);
- AjaxResult result = controller.Outpinmedicapply(dto1);
- String result1 = getAjaxResult(result);
- JSONObject object = getJSONObject(result1);
- String code = object.getStr("ResultCode");
- if(null !=code && code.equals("0")){
- JSONObject resultData = object.getJSONObject("ResultData");
-// Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
- String cfh = resultData.getStr("cfh");
- log.info("鑽搧鐢宠鍚庣殑澶勬柟鍙锋槸: "+cfh+" outpinmedicapplyDetilsDtos 閲岄潰鐨勫�间负: "+outpinmedicapplyDetilsDtos.toString());
- for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
- TjCf cf=new TjCf();
- cf.setJxbz(jxbz);
- cf.setCardId(cardId);
- cf.setSfzh(customer.getCusIdcard());
- cf.setCfh(cfh);
- cf.setSqysbm(ysbm);
- cf.setSqysxm(ysmc);
- cf.setMzksbn(dept);
- cf.setSqrq(date);
- cf.setCzybm(ysbm);
- cf.setYpbm(detilsDto.getYpbm());
- cf.setYpmc(detilsDto.getYpmc());
- cf.setSl(String.valueOf(detilsDto.getSl()));
- cf.setDj(String.valueOf(detilsDto.getDj()));
- cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
- cf.setPj(String.valueOf(detilsDto.getPj()));
- cf.setJj(String.valueOf(detilsDto.getJj()));
- cf.setCreateTime(new Date());
- cfService.save(cf);
+// String cflxbm = configService.selectConfigByKey("chufang_cflxbm");
+ Map<String, List<OutpinmedicapplyDetilsDto>> listMap = outpinmedicapplyDetilsDtos.stream().collect(Collectors.groupingBy(OutpinmedicapplyDetilsDto::getCflx));
+ listMap.forEach((cflx, details) -> {
+ OutpinmedicapplyDto dto1 = new OutpinmedicapplyDto();
+ dto1.setHisRegistrationId(cardId);
+ dto1.setSfzh(customer.getCusIdcard());
+ dto1.setSqysbm(ysbm);
+ dto1.setMzksbm(dept);
+ dto1.setSjrq(date);
+ if (czybm.equalsIgnoreCase("N"))
+ dto1.setCzybm(ysbm);
+ else dto1.setCzybm(czybm);
+ if (czyksbm.equalsIgnoreCase("N"))
+ dto1.setCzyksbm(dept);
+ else dto1.setCzyksbm(czyksbm);
+ dto1.setCflxbm(cflx);
+ if (yfbm.equalsIgnoreCase("N"))
+ dto1.setYfbm("1");
+ else dto1.setYfbm(yfbm);
+ dto1.setFyts("1");
+ if (mzzd.equalsIgnoreCase("N"))
+ dto1.setMzzd("");
+ else dto1.setMzzd(mzzd);
+ dto1.setDetails(details);
+ AjaxResult result = controller.Outpinmedicapply(dto1);
+ String result1 = getAjaxResult(result);
+ JSONObject object = getJSONObject(result1);
+ String code = object.getStr("ResultCode");
+ if (null != code && code.equals("0")) {
+ JSONObject resultData = object.getJSONObject("ResultData");
+ String cfh = resultData.getStr("cfh");
+ log.info("鑽搧鐢宠鍚庣殑澶勬柟鍙锋槸: " + cfh + " outpinmedicapplyDetilsDtos 閲岄潰鐨勫�间负: " + outpinmedicapplyDetilsDtos.toString());
+ for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
+ TjCf cf = new TjCf();
+ cf.setCardId(cardId);
+ cf.setSfzh(customer.getCusIdcard());
+ cf.setCfh(cfh);
+ cf.setSqysbm(ysbm);
+ cf.setSqysxm(ysmc);
+ cf.setMzksbn(dept);
+ cf.setSqrq(date);
+ cf.setCzybm(ysbm);
+ cf.setYpbm(detilsDto.getYpbm());
+ cf.setYpmc(detilsDto.getYpmc());
+ cf.setSl(String.valueOf(detilsDto.getSl()));
+ cf.setDj(String.valueOf(detilsDto.getDj()));
+ cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
+ cf.setPj(String.valueOf(detilsDto.getPj()));
+ cf.setJj(String.valueOf(detilsDto.getJj()));
+ cf.setCreateTime(new Date());
+ cfService.save(cf);
+ }
}
- }
+ });
}
}
}
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 4f71514..1cd00d5 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
@@ -745,6 +745,9 @@
asyncService.updateCheckType(order.getTjNumber());
}
+ // 11:42:04.617 [http-nio-5000-exec-72] ERROR c.a.d.p.DruidDataSource - [init,905] - init datasource error, url: jdbc:sqlserver://192.168.10.2:1433;DatabaseName=hospital;&characterEncoding=utf8
+ //com.microsoft.sqlserver.jdbc.SQLServerException: 椹卞姩绋嬪簭鏃犳硶閫氳繃浣跨敤瀹夊叏濂楁帴瀛楀眰(SSL)鍔犲瘑涓� SQL Server 寤虹珛瀹夊叏杩炴帴銆傞敊璇�:鈥淣o appropriate protocol (protocol is disabled or cipher suites are inappropriate)鈥濄��
+ //
//寮�鍚拰his瀵规帴
if (null != sfkqdyhis && sfkqdyhis.equals("Y")) {
List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId());
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java b/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
index a3924ad..892b157 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/config/DruidConfig.java
@@ -315,7 +315,7 @@
properties.setProperty("druid.enabled", enabled);
properties.setProperty("druid.driverClassName","com.microsoft.sqlserver.jdbc.SQLServerDriver");
properties.setProperty("druid.url","jdbc:sqlserver://"+ ip+":"+ port+";DatabaseName="+ db+
- ";&characterEncoding=utf8");
+ ";&characterEncoding=utf8;encrypt=false");
properties.setProperty("druid.username", user);
properties.setProperty("druid.password", password);
dataSource.restart(properties);
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOutpinmedicXm.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOutpinmedicXm.java
index 4d6d650..f81c3c1 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOutpinmedicXm.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjOutpinmedicXm.java
@@ -37,5 +37,7 @@
private String ypmc;
+ private String cflx;
+
private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
+}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinmedicapplyDetilsDto.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinmedicapplyDetilsDto.java
index 295adfd..1d54955 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinmedicapplyDetilsDto.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/hisDto/OutpinmedicapplyDetilsDto.java
@@ -28,4 +28,5 @@
private String yysm;
private String fzbl;
private String ypmc;
+ private String cflx;
}
diff --git a/ltkj-hosp/src/main/resources/mapper/TjOutpinmedicXmMapper.xml b/ltkj-hosp/src/main/resources/mapper/TjOutpinmedicXmMapper.xml
index a8a5df1..1fb4df1 100644
--- a/ltkj-hosp/src/main/resources/mapper/TjOutpinmedicXmMapper.xml
+++ b/ltkj-hosp/src/main/resources/mapper/TjOutpinmedicXmMapper.xml
@@ -17,12 +17,13 @@
<result property="fzbl" column="fzbl" jdbcType="VARCHAR"/>
<result property="zh" column="zh" jdbcType="VARCHAR"/>
<result property="ypmc" column="ypmc" jdbcType="VARCHAR"/>
+ <result property="cflx" column="cflx" jdbcType="VARCHAR"/>
</resultMap>
<sql id="Base_Column_List">
id,pro_id,ypbm,
pcbm,sl,dj,
dcjl,pj,jj,
- fzbl,zh,ypmc
+ fzbl,zh,ypmc,cflx
</sql>
</mapper>
--
Gitblit v1.8.0