From ff7f564dc6c43384857a80246f72575a40e86cde Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期五, 26 七月 2024 16:55:52 +0800
Subject: [PATCH] 参考范围为空时设置异常标志为空
---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 133 ++++++++++++++++++++++++++++----------------
1 files changed, 84 insertions(+), 49 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 f13d349..d5544f3 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
@@ -74,7 +74,6 @@
}
//瀵规帴his鎬绘帴鍙� 娉ㄥ唽鎸傚彿鎺ヨ瘖鐢宠鍗曟搷浣�
- @Transactional
@Logger
public AjaxResult HisApiMethods(TjCustomer customer, Long orderId) {
@@ -114,7 +113,7 @@
Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
//淇濆瓨鎸傚彿鍏ュ弬鍑哄弬
- resultDatasss.put("cardId", customer.getCardId());
+ resultDatasss.put("cardId",hisRegistrationId);
JSONObject object4 = JSONUtil.parseObj(resultDatasss);
LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpinregapply");
@@ -123,7 +122,11 @@
//闂ㄨ瘖鍖荤敓鎺ヨ瘖
controller.Outpinconapply(hisRegistrationId, date, "00029");
- customer.setCardId(hisRegistrationId);
+ if(null != tjOrder.getTjCategory() && !tjOrder.getTjCategory().equals("13")){
+ customer.setCardId(hisRegistrationId);
+ }else {
+ customer.setCardId("0");
+ }
customerService.updateById(customer);
transitionService.updateCardIdByTjNumAndIdCard(customer.getCusIdcard(), hisRegistrationId, tjOrder.getTjNumber());
tjOrder.setCardId(hisRegistrationId);
@@ -157,7 +160,7 @@
dto.setJzqk(9);
controller.Outpinimpapply(dto);
- return tijianshenqing(customer, date);
+ return tijianshenqing(customer, date,tjOrder.getCardId());
}
// }
@@ -168,10 +171,10 @@
//浣撴瀵筯is鐢宠鍗曡皟鐢ㄦ柟娉�
- private AjaxResult tijianshenqing(TjCustomer customer, String date) {
+ private AjaxResult tijianshenqing(TjCustomer customer, String date,String cardId) {
//妫�楠岀敵璇�
OutpintestapplyDto dto = new OutpintestapplyDto();
- dto.setHisRegistrationId(customer.getCardId());
+ dto.setHisRegistrationId(cardId);
dto.setSfzh(customer.getCusIdcard());
dto.setSqysbm("00029");
dto.setMzksbm("0101");
@@ -179,7 +182,7 @@
dto.setCzybm("00029");
dto.setCzyksbm("0101");
dto.setSfjz("0");
- List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(), customer.getCardId());
+ List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
if (null != detailList && detailList.size() > 0) {
@@ -200,6 +203,7 @@
detailsDto.setSfzhfy("0");
}
detailsDto.setSl(project.getSl());
+ detailsDto.setProjg(project.getProPrice());
detailsDtos.add(detailsDto);
}
if(project.getProId()==1740177341251154377L){
@@ -211,6 +215,20 @@
detilsDto.setDcjl("1");
detilsDto.setPj("60");
detilsDto.setJj("60");
+ detilsDto.setJldw("");
+ detilsDto.setTjbm("");
+ detilsDto.setPs("");
+ detilsDto.setPsbm("");
+ detilsDto.setYyts("");
+ detilsDto.setXtph("");
+ detilsDto.setScph("");
+ detilsDto.setYpxq("");
+ detilsDto.setCdbm("");
+ detilsDto.setKfdw("");
+ detilsDto.setYfdw("");
+ detilsDto.setYysm("");
+ detilsDto.setFzbl("1");
+ detilsDto.setZh("0");
outpinmedicapplyDetilsDtos.add(detilsDto);
}
}
@@ -228,24 +246,31 @@
for (OutpintestapplyDetailsDto detail : details) {
LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
tree.setCardId(dto.getHisRegistrationId());
- LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
- wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
- TjCustomer tjCustomer = customerService.getOne(wrapper4);
- tree.setPationid(tjCustomer.getPationId());
+ tree.setPationid(customer.getPationId());
JSONObject resultData = object3.getJSONObject("ResultData");
tree.setSqdh(resultData.getStr("jysqdh"));
tree.setFyhj(resultData.getStr("fyhj"));
String mxfyxmbm = detail.getMxfyxmbm();
tree.setHisXmdm(mxfyxmbm);
tree.setType("妫�楠�");
- LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
- List<TjProject> list = projectService.list(wrapper);
- String tj_price = "";
- for (TjProject project : list) {
- tj_price += project.getProPrice() + "銆�";
- }
- tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
+// LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+// List<TjProject> list = projectService.list(wrapper);
+// String tj_price = "";
+// for (TjProject project : list) {
+// tj_price += project.getProPrice() + "銆�";
+// }
+// tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
+// LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+// wrapper.eq(TjProject::getSl,1);
+// wrapper.groupBy(TjProject::getHisXmbm);
+// TjProject project = projectService.getOne(wrapper);
+// if(null !=project){
+// BigDecimal decimal = project.getProPrice().multiply(BigDecimal.valueOf(detail.getSl()));
+// tree.setTjPrice(String.valueOf(decimal));
+// }
+ tree.setTjPrice(String.valueOf(detail.getProjg()));
LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
if (detail.getSfzhfy().equals("1"))
wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
@@ -269,7 +294,7 @@
//鑽搧鐢宠
if(outpinmedicapplyDetilsDtos.size()>0){
OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
- dto1.setHisRegistrationId(customer.getCardId());
+ dto1.setHisRegistrationId(cardId);
dto1.setSfzh(customer.getCusIdcard());
dto1.setSqysbm("00029");
dto1.setMzksbm("0101");
@@ -278,6 +303,8 @@
dto1.setCzyksbm("0101");
dto1.setCflxbm("A");
dto1.setYfbm("1");
+ dto1.setFyts("1");
+ dto1.setMzzd("");
dto1.setDetails(outpinmedicapplyDetilsDtos);
AjaxResult result = controller.Outpinmedicapply(dto1);
String result1 = getAjaxResult(result);
@@ -290,7 +317,7 @@
for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
TjCf cf=new TjCf();
- cf.setCardId(customer.getCardId());
+ cf.setCardId(cardId);
cf.setSfzh(customer.getCusIdcard());
cf.setCfh(cfh);
cf.setSqysbm("00029");
@@ -313,14 +340,14 @@
//闂ㄨ瘖妫�鏌ョ敵璇�
OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
- outpinexamapplyDto.setHisRegistrationId(customer.getCardId());
+ outpinexamapplyDto.setHisRegistrationId(cardId);
outpinexamapplyDto.setSfzh(customer.getCusIdcard());
outpinexamapplyDto.setSqysbm("00029");
outpinexamapplyDto.setMzksbm("0101");
outpinexamapplyDto.setCzybm("00029");
outpinexamapplyDto.setCzyksbm("0101");
outpinexamapplyDto.setSfjz("0");
- List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(), customer.getCardId());
+ List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>();
if (null != detailLists && detailLists.size() > 0) {
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
@@ -340,6 +367,7 @@
detailsDto.setSfzhfy("0");
}
detailsDto.setSl(project.getSl());
+ detailsDto.setProjg(project.getProPrice());
detailsDtoss.add(detailsDto);
}
@@ -358,24 +386,31 @@
for (OutpintestapplyDetailsDto detail : details) {
LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
tree.setCardId(outpinexamapplyDto.getHisRegistrationId());
- LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
- wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
- TjCustomer tjCustomer = customerService.getOne(wrapper4);
- tree.setPationid(tjCustomer.getPationId());
+ tree.setPationid(customer.getPationId());
JSONObject resultData = object5.getJSONObject("ResultData");
tree.setSqdh(resultData.getStr("jcsqdh"));
tree.setFyhj(resultData.getStr("fyhj"));
String mxfyxmbm = detail.getMxfyxmbm();
tree.setHisXmdm(mxfyxmbm);
tree.setType("妫�鏌�");
- LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
- List<TjProject> list = projectService.list(wrapper);
- String tj_price = "";
- for (TjProject project : list) {
- tj_price += project.getProPrice() + "銆�";
- }
- tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
+// LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+// List<TjProject> list = projectService.list(wrapper);
+// String tj_price = "";
+// for (TjProject project : list) {
+// tj_price += project.getProPrice() + "銆�";
+// }
+// tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
+// LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+// wrapper.eq(TjProject::getSl,1);
+// wrapper.groupBy(TjProject::getHisXmbm);
+// TjProject project = projectService.getOne(wrapper);
+// if(null !=project){
+// BigDecimal decimal = project.getProPrice().multiply(BigDecimal.valueOf(detail.getSl()));
+// tree.setTjPrice(String.valueOf(decimal));
+// }
+ tree.setTjPrice(String.valueOf(detail.getProjg()));
LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
if (detail.getSfzhfy().equals("1"))
wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
@@ -410,7 +445,7 @@
//闂ㄨ瘖娌荤枟澶勭疆鐢宠
OutpintreatapplyDto dao = new OutpintreatapplyDto();
- dao.setHisRegistrationId(customer.getCardId());
+ dao.setHisRegistrationId(cardId);
dao.setSfzh(customer.getCusIdcard());
dao.setSqysbm("00029");
dao.setMzksbm("0101");
@@ -418,7 +453,7 @@
dao.setCzybm("00029");
dao.setCzyksbm("0101");
dao.setSfjz("0");
- List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(), customer.getCardId());
+ List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
if (null != details && details.size() > 0) {
LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
@@ -439,6 +474,7 @@
detailsDto.setSfzhfy("0");
}
detailsDto.setSl(project.getSl());
+ detailsDto.setProjg(project.getProPrice());
detailDtos.add(detailsDto);
}
}
@@ -456,24 +492,23 @@
for (OutpintestapplyDetailsDto detail : details1) {
LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
tree.setCardId(dao.getHisRegistrationId());
- LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
- wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
- TjCustomer tjCustomer = customerService.getOne(wrapper4);
- tree.setPationid(tjCustomer.getPationId());
+ tree.setPationid(customer.getPationId());
JSONObject resultData = mzylyzsq3.getJSONObject("ResultData");
tree.setSqdh(resultData.getStr("zlczh"));
tree.setFyhj(resultData.getStr("fyhj"));
String mxfyxmbm = detail.getMxfyxmbm();
tree.setHisXmdm(mxfyxmbm);
tree.setType("澶勭疆");
- LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
- wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
- List<TjProject> list = projectService.list(wrapper);
- String tj_price = "";
- for (TjProject project : list) {
- tj_price += project.getProPrice() + "銆�";
- }
- tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
+// LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
+// wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
+// wrapper.eq(TjProject::getSl,1);
+// wrapper.groupBy(TjProject::getHisXmbm);
+// TjProject project = projectService.getOne(wrapper);
+// if(null !=project){
+// BigDecimal decimal = project.getProPrice().multiply(BigDecimal.valueOf(detail.getSl()));
+// tree.setTjPrice(String.valueOf(decimal));
+// }
+ tree.setTjPrice(String.valueOf(detail.getProjg()));
LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
if (detail.getSfzhfy().equals("1"))
wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
--
Gitblit v1.8.0