diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java index bc37c31..939679a 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/InspectPatientController.java @@ -307,9 +307,9 @@ public class InspectPatientController { { //检查项目 - List dataList2 = new ArrayList<>(); + // List dataList2 = new ArrayList<>(); //检查套餐信息 - List doList = exammoduleService.selectItemsByExamModuleID(1001); + // List doList = exammoduleService.selectItemsByExamModuleID(1001); // 获取当前日期并格式化为 yyyyMMdd 格式 LocalDate currentDate = LocalDate.now(); String datePart = currentDate.format(DateTimeFormatter.ofPattern("yyyyMMdd")); @@ -328,11 +328,43 @@ public class InspectPatientController { rowData.setStatus(0); patientService.createPatient(rowData); +// //填写项目信息 +// for (InspectitemsDO inspectitemsDO : doList) { +// //套餐信息 +// InspectPatientitemsSaveReqVO rowData2 = new InspectPatientitemsSaveReqVO(); +// rowData2.setMedicalSn(sequencePart); +// rowData2.setItemCode(inspectitemsDO.getItemCode()); +// rowData2.setItemName(inspectitemsDO.getItemName()); +// rowData2.setPrice(inspectitemsDO.getPrice()); +// rowData2.setSectionID(inspectitemsDO.getSectionID()); +// rowData2.setUnit(inspectitemsDO.getUnit()); +// rowData2.setItemStatus("0"); +// rowData2.setGroupname(inspectitemsDO.getGroupname()); +// rowData2.setGroupcode(inspectitemsDO.getGroupcode()); +// rowData2.setCreateTime(LocalDateTime.now()); +// rowData2.setHighValue(inspectitemsDO.getHighValue()); +// rowData2.setLowValue(inspectitemsDO.getLowValue()); +// rowData2.setMealfrontorafter(inspectitemsDO.getMealfrontorafter()); +// dataList2.add(rowData2); +// } +// // 分批插入患者项目信息 +// batchInsertPatientItems(dataList2); + return success(true); + } + @GetMapping("/createPatientitem") + @Operation(summary = "通过体检编号绑定检查项目信息") + public CommonResult createPatientitem(@RequestParam("medicalSn") String medicalSn) + { + //检查项目 + List dataList2 = new ArrayList<>(); + //检查套餐信息 + List doList = exammoduleService.selectItemsByExamModuleID(1001); + //填写项目信息 for (InspectitemsDO inspectitemsDO : doList) { //套餐信息 InspectPatientitemsSaveReqVO rowData2 = new InspectPatientitemsSaveReqVO(); - rowData2.setMedicalSn(sequencePart); + rowData2.setMedicalSn(medicalSn); rowData2.setItemCode(inspectitemsDO.getItemCode()); rowData2.setItemName(inspectitemsDO.getItemName()); rowData2.setPrice(inspectitemsDO.getPrice()); @@ -347,11 +379,14 @@ public class InspectPatientController { rowData2.setMealfrontorafter(inspectitemsDO.getMealfrontorafter()); dataList2.add(rowData2); } - // 分批插入患者项目信息 - batchInsertPatientItems(dataList2); + if(dataList2.size()>0) + { + // 分批插入患者项目信息 + batchInsertPatientItems(dataList2); + } + return success(true); } - @GetMapping("/syncinspectApplyTj") @Operation(summary = "发送检验申请单") public CommonResult syncinspectApplyTj(@RequestParam("medicalSn") String medicalSn) throws JsonProcessingException {