diff --git a/src/main/java/com/example/controller/MedicalRecordController.java b/src/main/java/com/example/controller/MedicalRecordController.java index a37776e7e708698f607b14a3f9e68a469619fb89..9d7fb42a30c38bf7b7f8c6472c391ad70beb97b7 100644 --- a/src/main/java/com/example/controller/MedicalRecordController.java +++ b/src/main/java/com/example/controller/MedicalRecordController.java @@ -36,7 +36,7 @@ public class MedicalRecordController { public RespBean addDrugs(@RequestBody Drugs drugs){ int result = medicalRecordService.addDrugs(drugs); if(result == 2){ - return new RespBean("success","添加成功"); + return new RespBean("success","添加成功",drugs.getId()); } else { return new RespBean("error","添加失败"); @@ -53,6 +53,31 @@ public class MedicalRecordController { return new RespBean("error","删除失败"); } } + + @GetMapping("/deleteDrugs") + public RespBean deleteDrugs(int did) + { + int result = medicalRecordService.deleteDrugs(did); + if(result == 1){ + return new RespBean("success","删除成功"); + } + else{ + return new RespBean("error","删除失败"); + } + } + + @PostMapping("/updateMedicalRecord") + public RespBean updateMedicalRecord(MedicalRecord medicalRecord) + { + int result = medicalRecordService.updateMedicalRecord(medicalRecord); + if(result == 1){ + return new RespBean("success","更改成功"); + } + else{ + return new RespBean("error","更改失败"); + } + } + @GetMapping("showUSummary") public RespBean showSummary(@RequestParam("usid") String uid){ int result = medicalRecordService.getSummaryByUid(uid); @@ -65,9 +90,10 @@ public class MedicalRecordController { } @GetMapping("selectRecordByUid") - public List selectRecordByUid(@RequestParam("uid") String userid) + public List selectRecordByUid(String uid) { - return medicalRecordService.selectByUserid(userid); + System.out.println(uid); + return medicalRecordService.selectByUserid(uid); } @GetMapping("/selectByUseridDoctor") @@ -83,8 +109,8 @@ public class MedicalRecordController { return respBeans; } - @PostMapping("selectRecordByDid") - public List selectRecordByDid(@RequestParam("did") String did) + @GetMapping("selectRecordByDid") + public List selectRecordByDid(String did) { return medicalRecordService.selectByDid(did); } diff --git a/src/main/java/com/example/mapper/DrugsMapper.java b/src/main/java/com/example/mapper/DrugsMapper.java index cad3f7426c6ab863b7e203768a5c691c726c90c9..a8576c424e111bba6e9f24ed75285296dd86111b 100644 --- a/src/main/java/com/example/mapper/DrugsMapper.java +++ b/src/main/java/com/example/mapper/DrugsMapper.java @@ -11,4 +11,5 @@ public interface DrugsMapper { List getDrugsByMid(int mid); int addDrugs(Drugs drugs); int deleteDurgsRelation(int mid); + int deleteDrugsRelationSingle(int did); } diff --git a/src/main/java/com/example/service/MedicalRecordService.java b/src/main/java/com/example/service/MedicalRecordService.java index e8f10c986da624d670fcb35b233484db61fc1cea..becb73a2b33c7201b8e347f084ef490042030c18 100644 --- a/src/main/java/com/example/service/MedicalRecordService.java +++ b/src/main/java/com/example/service/MedicalRecordService.java @@ -82,6 +82,13 @@ public class MedicalRecordService { return medicalRecordMapper.deleteMedicalRecordByMid(mid);//最后删除该病历 } + public int deleteDrugs(int did) + { + drugsMapper.deleteDrugsById(did); + int result = drugsMapper.deleteDrugsRelationSingle(did); + return result; + } + public List getDrugsById(int mid) { return drugsMapper.getDrugsByMid(mid); diff --git a/src/main/resources/application-personal.properties b/src/main/resources/application-personal.properties index f14877012a472a53d15a5cc5b9df9fd6e301ac21..a8c03a4769b73eeefa5fdfae173207e3605dc07c 100644 --- a/src/main/resources/application-personal.properties +++ b/src/main/resources/application-personal.properties @@ -1,5 +1,5 @@ -spring.datasource.url=jdbc:mysql://localhost:3306/hospital?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai +spring.datasource.url=jdbc:mysql://localhost:3306/health?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai spring.datasource.username=root -spring.datasource.password=Y2002t10z02 +spring.datasource.password=52118259541xx server.port=8080 \ No newline at end of file diff --git a/src/main/resources/com/example/mapper/DrugsMapper.xml b/src/main/resources/com/example/mapper/DrugsMapper.xml index f30f91694d0d9698998757efd7b2b76e16ace5ca..7c33dfdd7ec7cca19ec27688ca80d24161f8be3b 100644 --- a/src/main/resources/com/example/mapper/DrugsMapper.xml +++ b/src/main/resources/com/example/mapper/DrugsMapper.xml @@ -12,6 +12,10 @@ delete from mrecord_drugs where mid = #{mid}; + + delete from mrecord_drugs where did = #{did}; + + insert into drugs (name, specification, number, way, dosage) values (#{name},#{specification},#{number},#{way},#{dosage}); diff --git a/src/main/resources/com/example/mapper/MedicalRecordMapper.xml b/src/main/resources/com/example/mapper/MedicalRecordMapper.xml index 328797c151bd0cb47ae9fc0fa10406010ec182ed..d8d1d94fc82d63960f8f4e22ea58b685fd26f6df 100644 --- a/src/main/resources/com/example/mapper/MedicalRecordMapper.xml +++ b/src/main/resources/com/example/mapper/MedicalRecordMapper.xml @@ -9,15 +9,12 @@ values (#{uid},#{did},#{symptom},#{recordtime},#{diagnose}); - - update medicalrecord - set - uid=#{uid}, - did = #{did}, - symptom = #{symptom}, - recordtime =#{recordtime}, - diagnose = #{diagnose} - where mid = #{mid}; + + update medicalrecord + set + symptom = #{symptom}, + diagnose = #{diagnose} + where mid = #{mid};