diff --git a/Dockerfile b/Dockerfile
index ab14b62..a2b05f2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,8 +14,5 @@ COPY /grail-patient-interrogation-server/target/grail-patient-interrogation-serv
# 工作目录 exec -it 进来就是默认这个目录
WORKDIR /home
-# 指定东八区
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > .etc.timezone
-
# 启动java程序
CMD ["java","-Dfile.encoding=UTF-8","-jar","/home/app.jar"]
diff --git a/grail-patient-interrogation-common/pom.xml b/grail-patient-interrogation-common/pom.xml
index af8d700..897c206 100644
--- a/grail-patient-interrogation-common/pom.xml
+++ b/grail-patient-interrogation-common/pom.xml
@@ -37,6 +37,8 @@
org.springframework.boot
spring-boot-actuator-autoconfigure
+
+
diff --git a/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/enums/HomepageEnums.java b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/enums/HomepageEnums.java
new file mode 100644
index 0000000..4d398c2
--- /dev/null
+++ b/grail-patient-interrogation-common/src/main/java/com/grail/interrogation/enums/HomepageEnums.java
@@ -0,0 +1,30 @@
+package com.grail.interrogation.enums;
+
+/**
+ * @description: TODO
+ * @author: SIKADI
+ * @date: 2023/11/3 8:04
+ **/
+
+public enum HomepageEnums {
+ INQUIRE("查询"),
+ DELETE("删除"),
+ REVISE("修改"),
+ ADDITION("添加");
+
+ private final String name;
+
+ HomepageEnums(String name) {
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+
+
+
+
+
+}
diff --git a/grail-patient-interrogation-server/pom.xml b/grail-patient-interrogation-server/pom.xml
index 116ab01..dd73738 100644
--- a/grail-patient-interrogation-server/pom.xml
+++ b/grail-patient-interrogation-server/pom.xml
@@ -87,6 +87,7 @@
3.6.3
+
com.grail
grail-patient-interrogation-remote
diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/DiseaseDetatilController.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/DiseaseDetatilController.java
index 61aa9c8..46ece82 100644
--- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/DiseaseDetatilController.java
+++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/controller/DiseaseDetatilController.java
@@ -86,4 +86,6 @@ public class DiseaseDetatilController {
+
+
}
diff --git a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/HomepageServerImpl.java b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/HomepageServerImpl.java
index 2a051c2..d373d75 100644
--- a/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/HomepageServerImpl.java
+++ b/grail-patient-interrogation-server/src/main/java/com/grail/interrogation/service/impl/HomepageServerImpl.java
@@ -51,14 +51,11 @@ public class HomepageServerImpl implements HomepageServer {
// 根据redis 来进行试发正确
if(redisService.hasKey(REDIS_HOMEPAGE)){
// 查询出来,并删除
- List cacheList = redisService.getCacheList(REDIS_HOMEPAGE);
- return cacheList;
+ return redisService.getCacheList(REDIS_HOMEPAGE);
}
List homepages = homepageMapper.homepageList(0);
-
homepages.forEach( item -> {
- List listHomepages = homepageMapper.homepageListPid(item.getId());
- item.setHomepageList(listHomepages);
+ item.setHomepageList(homepageMapper.homepageListPid(item.getId()));
} );
redisService.setCacheList(REDIS_HOMEPAGE,homepages);
return homepages;
@@ -78,13 +75,10 @@ public class HomepageServerImpl implements HomepageServer {
// pid进行一个判断,是否对应 1 , 2
if(1 == homepage.getPid()){
// 查序id 是不是有对应的数据
- List list = medicineDetailMapper.List(homepage.getId());
- homepage.setMedicineDetailList(list);
+ homepage.setMedicineDetailList(medicineDetailMapper.List(homepage.getId()));
}else {
- // 判断是为错误的,联查的数据添加
- List list = diseaseDetatilMapper.List(homepage.getId());
// 赋值进去
- homepage.setDiseaseDetatilList(list);
+ homepage.setDiseaseDetatilList(diseaseDetatilMapper.List(homepage.getId()));
}
// 回显出去
return homepage;
@@ -102,14 +96,12 @@ public class HomepageServerImpl implements HomepageServer {
public DiseaseMedicineResponse medicineDiseaseList(HomepageRequest homepageRequest) {
// 创建一个为空的数据
DiseaseMedicineResponse list = new DiseaseMedicineResponse();
- // 查询是否为空
- List medicineDetailList = medicineDetailMapper.medicineList(homepageRequest.getHomepageName());
- // 更新操作
- List diseaseDetatils = diseaseDetatilMapper.diseaseList(homepageRequest.getHomepageName());
- // 赋值上去
- list.setMedicineDetailList(medicineDetailList);
- // 赋值上去
- list.setDiseaseDetatils(diseaseDetatils);
+ // 先进行查询对应药品的列表 , 再进行赋值
+ list.setMedicineDetailList(medicineDetailMapper
+ .medicineList(homepageRequest.getHomepageName()));
+ // 先进查询对应的病症的列表, 再进行赋值
+ list.setDiseaseDetatils(diseaseDetatilMapper
+ .diseaseList(homepageRequest.getHomepageName()));
return list;
}
}
diff --git a/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/MedicineDetailMapper.xml b/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/MedicineDetailMapper.xml
index 19c2b9b..3833e56 100644
--- a/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/MedicineDetailMapper.xml
+++ b/grail-patient-interrogation-server/src/main/resources/mapper/interrogation/MedicineDetailMapper.xml
@@ -71,8 +71,11 @@
FROM
tb_medicine_datail a
LEFT JOIN homepage_middle_medicicne b ON a.medicine_id = b.middle_medcicne
- WHERE
-
+
+
+ b.homepageName like CONCAT('%',#{homepageName},'%')
+
+