diff --git a/yudao-module-inspect/yudao-module-inspect-biz/pom.xml b/yudao-module-inspect/yudao-module-inspect-biz/pom.xml index 1572da7..8cf7e06 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/pom.xml +++ b/yudao-module-inspect/yudao-module-inspect-biz/pom.xml @@ -29,6 +29,12 @@ yudao-spring-boot-starter-security + + + cn.iocoder.boot + yudao-common + + cn.iocoder.boot 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 e97525f..c2758e4 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 @@ -476,7 +476,8 @@ public class InspectPatientController { Map patient = new HashMap<>(); patient.put("patientName", patientDO.getPName()); patient.put("idCard", patientDO.getCardId()); - patient.put("hospitalCode", "121526004609160793"); + //乌兰察布第四医院:121526004609160793|乌兰察布第四医院实验室:221526004609160793 + patient.put("hospitalCode", patientDO.getHospitalNo()); patient.put("sampleSource", "TJ"); patient.put("patientGender", patientDO.getGender().equals("女") ? "1" : "0"); patient.put("patientAge", StrUtils.calculateAgeFromIdCard(patientDO.getCardId())); @@ -531,7 +532,7 @@ public class InspectPatientController { InspectPatientSaveReqVO updateReqVO = new InspectPatientSaveReqVO(); updateReqVO.setMedicalSn(patientDO.getMedicalSn()); - updateReqVO.setHospitalNo("121526004609160793");//乌兰察布第四医院 暂时写死 + updateReqVO.setHospitalNo(patientDO.getHospitalNo()); updateReqVO.setNcgcode(checkBarCode2); updateReqVO.setXcgcode(checkBarCode1); updateReqVO.setShqx(checkBarCode3); @@ -2021,8 +2022,9 @@ public class InspectPatientController { @Operation(summary = "根据体检编号更新患者归属医院") public CommonResult updatePatientOrg(@RequestParam("medicalSn") String medicalSn, @RequestParam("examhoscode") String examhoscode, - @RequestParam("examhosname") String examhosname) { - patientService.updatePatientOrg(medicalSn, examhoscode, examhosname); + @RequestParam("examhosname") String examhosname, + @RequestParam("hospitalNo") String hospitalNo) { + patientService.updatePatientOrg(medicalSn, examhoscode, examhosname,hospitalNo); return success(true); } } \ No newline at end of file diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientService.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientService.java index 32294c7..5a24035 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientService.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientService.java @@ -61,7 +61,7 @@ public interface InspectPatientService { /* * 根据体检编号更新患者归属医院信息 */ - void updatePatientOrg(String medicalSn, String examhoscode, String examhosname); + void updatePatientOrg(String medicalSn, String examhoscode, String examhosname,String hospitalNo); /** * 删除患者信息 diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java index b50744a..49ea3c0 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/service/inspectpatient/InspectPatientServiceImpl.java @@ -137,11 +137,12 @@ public class InspectPatientServiceImpl implements InspectPatientService { patientMapper.update(null, updateWrapper); } @Override - public void updatePatientOrg(String medicalSn, String examhoscode, String examhosname) { + public void updatePatientOrg(String medicalSn, String examhoscode, String examhosname,String hospitalNo) { LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(InspectPatientDO::getMedicalSn, medicalSn) .set(InspectPatientDO::getExamhoscode, examhoscode) - .set(InspectPatientDO::getExamhosname, examhosname); + .set(InspectPatientDO::getExamhosname, examhosname) + .set(InspectPatientDO::getHospitalNo, hospitalNo); patientMapper.update(null, updateWrapper); } @Override