From 06059e134de6817418335516f56bbf4280ff351b Mon Sep 17 00:00:00 2001 From: zjh <1084500556@qq.com> Date: 星期六, 04 一月 2025 18:56:07 +0800 Subject: [PATCH] zjh20250104 --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java index 5bbbdaf..6e0d904 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java @@ -232,6 +232,8 @@ private ISysDictDataService sysDictDataService; @Autowired private TjFlowingWaterHisService tjFlowingWaterHisService; + @Resource + private ITjXdPictureService xdPictureService; //灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡 public JSONObject getJSONObject(String builder) { @@ -496,13 +498,9 @@ order.setIdType(tjCustomer.getIdType()); order.setAgeUnit(tjCustomer.getAgeUnit()); order.setTjCount(String.valueOf(tjCustomer.getCusNumber())); - if (null != tjCustomer.getCompName()) { - order.setDictCompName(tjCustomer.getCompName()); - } else { - String firmId = order.getFirmId(); - if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) { - order.setDictCompName(iDictCompService.getById(String.valueOf(order.getFirmId())).getCnName()); - } + String firmName = order.getFirmName(); + if (StringUtil.isNotBlank(firmName)) { + order.setDictCompName(firmName); } if (null != order.getPacId()) { if (null != tjPackageService.getById(order.getPacId())) { @@ -1037,16 +1035,9 @@ tjOrder.setTjType("2"); } } - - if (null != tjCustomer.getCompName()) { - tjOrder.setFirmName(tjCustomer.getCompName()); - } - if (null != tjCustomer.getDictCompId()) { - tjOrder.setFirmId(String.valueOf(tjCustomer.getDictCompId())); - } else { + if(StringUtil.isBlank(tjOrder.getFirmId())){ tjOrder.setFirmId("0"); } - if (null != tjOrder.getPhoto()) { File file = new File(tjOrder.getPhoto()); @@ -1231,6 +1222,8 @@ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString()); + List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber()); + xdPictureService.saveBatch(xdPictureList); List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId()); addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null); } else { @@ -1342,13 +1335,15 @@ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString()); + List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber()); + xdPictureService.saveBatch(xdPictureList); List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId()); addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null); return AjaxResult.success(tjNumber); }else { newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater); - List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId()); - addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null); +// List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId()); +// addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null); } String s = configService.selectConfigByKey("is_request_common_his_api"); @@ -1427,6 +1422,7 @@ } public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser, String jxbz) { + String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix"); if (null != detailList && detailList1) { Date date = new Date(); String format = DateUtil.format(date, "yyMMddHHmmssSSS"); @@ -1437,13 +1433,13 @@ Long proParentId = project.getProParentId(); String dictLabel = sysDictDataService.selectDictLabel("sys_dict_specimen", project.getSpecimenType()); if (null != proParentId && proParentId == 0) { - sampling.setJyxh(idUtils.generateLisID()); + sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix)); sampling.setSpecimenTypeCode(project.getSpecimenType()); sampling.setSpecimenType(dictLabel); sampling.setJyxmdm(project.getProId().toString()); } else { TjProject project1 = projectService.getById(proParentId); - sampling.setJyxh(idUtils.generateLisID()); + sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix)); sampling.setSpecimenTypeCode(project1.getSpecimenType()); sampling.setSpecimenType(dictLabel); @@ -2695,6 +2691,8 @@ tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber())); remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString()); + List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber()); + xdPictureService.saveBatch(xdPictureList); } } if (tjFlowingWater.getPayStasus() == 1L) { @@ -2706,6 +2704,8 @@ tjFlowingWaterService.updateById(tjFlowingWater); remarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString()); // asyncService.addTjChargingStandard(tjOrder, transitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(), tjOrder.getCardId()), sysUser); + List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber()); + xdPictureService.saveBatch(xdPictureList); } } @@ -3068,7 +3068,7 @@ TjCustomer customer = tjCustomerService.getById(order.getUserId()); customer.setCardId("0"); tjCustomerService.updateById(customer); - + xdPictureService.deleteTjXdPictureBytjNum(tjNum); tjSamplingMapper.deleteByTjNumAndCusId(tjNum, order.getUserId()); } -- Gitblit v1.8.0