From 33414c28de4aaf480fc4ddb80063e955be62e181 Mon Sep 17 00:00:00 2001
From: wang1007152140 <1007152140@qq.com>
Date: Fri, 5 Feb 2021 16:19:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ccsens/tcm/service/PatientService.java    | 25 +++++++++++++------
 tcm/src/main/resources/application-dev.yml    | 11 +++++++-
 tcm/src/main/resources/application-prod.yml   | 11 +++++++-
 tcm/src/main/resources/application-test.yml   |  9 +++++++
 4 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java
index c9c7586c..911ea3a3 100644
--- a/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java
+++ b/tcm/src/main/java/com/ccsens/tcm/service/PatientService.java
@@ -23,6 +23,7 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
@@ -53,6 +54,22 @@ public class PatientService implements IPatientService {
     private PatientDao patientDao;
     @Resource
     private InpatientMapper inpatientMapper;
+    @Value("${day.one}")
+    public int one;
+    @Value("${day.two}")
+    public int two;
+    @Value("${day.oneFront}")
+    public int oneFront;
+    @Value("${day.oneAfter}")
+    public int oneAfter;
+    @Value("${day.twoAfter}")
+    public int twoAfter;
+    @Value("${day.three}")
+    public int three;
+    @Value("${day.threeFront}")
+    public int threeFront;
+    @Value("${day.threeAfter}")
+    public int threeAfter;
 
     @Override
     public void savePatient(PatientDto.SavePatient param, Long userId) {
@@ -92,14 +109,6 @@ public class PatientService implements IPatientService {
 
 
         //试题只需要记录3次的   9 和30 算分界限 <9 =0  ;<30 =14 ; >30 =90    记录2次的    270 算分界线 <270 算180 ，>270 算365
-        int one=9;
-        int two=30;
-        int oneFront=0;
-        int oneAfter=14;
-        int twoAfter=90;
-        int three=270;
-        int threeFront=180;
-        int threeAfter=365;
         //是否需要去修改基本信息表中的录入状态
         Boolean update=false;
         //先查看这个患者的需要的记录次数，在下面的这个对照组对象中呢
diff --git a/tcm/src/main/resources/application-dev.yml b/tcm/src/main/resources/application-dev.yml
index 06f2e23e..dd22ee3d 100644
--- a/tcm/src/main/resources/application-dev.yml
+++ b/tcm/src/main/resources/application-dev.yml
@@ -34,4 +34,13 @@ file:
   imgDomain: https://test.tall.wiki/gateway/tcm/uploads/
 #gameMqName: game_status_wisdom
 logging:
-  path:
\ No newline at end of file
+  path:
+day:
+  one: 9
+  two: 30
+  oneFront: 0
+  oneAfter: 14
+  twoAfter: 90
+  three: 270
+  threeFront: 180
+  threeAfter: 365
\ No newline at end of file
diff --git a/tcm/src/main/resources/application-prod.yml b/tcm/src/main/resources/application-prod.yml
index 46906293..8029e69d 100644
--- a/tcm/src/main/resources/application-prod.yml
+++ b/tcm/src/main/resources/application-prod.yml
@@ -37,4 +37,13 @@ file:
   path: /home/cloud/tcm/uploads/
   signUpUrl: https://www.tall.wiki/compete/
   domain: https://www.tall.wiki/gateway/tcm/
-  imgDomain: https://www.tall.wiki/gateway/tcm/uploads/
\ No newline at end of file
+  imgDomain: https://www.tall.wiki/gateway/tcm/uploads/
+day:
+  one: 9
+  two: 30
+  oneFront: 0
+  oneAfter: 14
+  twoAfter: 90
+  three: 270
+  threeFront: 180
+  threeAfter: 365
\ No newline at end of file
diff --git a/tcm/src/main/resources/application-test.yml b/tcm/src/main/resources/application-test.yml
index 075e57cb..92d2cc05 100644
--- a/tcm/src/main/resources/application-test.yml
+++ b/tcm/src/main/resources/application-test.yml
@@ -33,3 +33,12 @@ file:
   path: /home/cloud/tcm/uploads/
   domain: https://test.tall.wiki/gateway/tcm/
   imgDomain: https://test.tall.wiki/gateway/tcm/uploads/
+day:
+  one: 9
+  two: 30
+  oneFront: 0
+  oneAfter: 14
+  twoAfter: 90
+  three: 270
+  threeFront: 180
+  threeAfter: 365