Commit f7e4fcb4bea3791de4e123e68a215357bcd14d12
1 parent
6e1f009a78
Exists in
master
and in
6 other branches
增加初诊页面的现病史的字段
Showing 4 changed files with 40 additions and 21 deletions
- platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPsychologistRequest.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java
View file @
f7e4fcb
... | ... | @@ -33,7 +33,7 @@ |
33 | 33 | |
34 | 34 | /*母亲信息*/ |
35 | 35 | //母亲姓名 |
36 | - private String mname; | |
36 | + private String mname; | |
37 | 37 | //母亲证件号 |
38 | 38 | private String mcertNo; |
39 | 39 | //母亲手机号码 |
40 | 40 | |
41 | 41 | |
42 | 42 | |
... | ... | @@ -41,15 +41,15 @@ |
41 | 41 | |
42 | 42 | /*儿童信息*/ |
43 | 43 | //儿童姓名 |
44 | - private String name; | |
44 | + private String name; | |
45 | 45 | // 儿童编码格式20200721001 |
46 | 46 | private String encoded; |
47 | 47 | //儿童证件号 |
48 | - private String certNo; | |
48 | + private String certNo; | |
49 | 49 | //儿童性别 |
50 | - private Integer sex; | |
50 | + private Integer sex; | |
51 | 51 | //儿童就诊卡号 |
52 | - private String vcCardNo; | |
52 | + private String vcCardNo; | |
53 | 53 | //儿童社保卡 |
54 | 54 | private String sINCard; |
55 | 55 | //儿童生日 |
... | ... | @@ -187,6 +187,9 @@ |
187 | 187 | //刺激过低或过高反应 |
188 | 188 | private String cjfy; |
189 | 189 | |
190 | + //初诊页面的现病史 | |
191 | + private String presentIllness; | |
192 | + | |
190 | 193 | public String getCjfy() { |
191 | 194 | return cjfy; |
192 | 195 | } |
... | ... | @@ -819,5 +822,18 @@ |
819 | 822 | public void setPdyyjl(String pdyyjl) { |
820 | 823 | this.pdyyjl = pdyyjl; |
821 | 824 | } |
825 | + | |
826 | + public String getPresentIllness() { | |
827 | + return presentIllness; | |
828 | + } | |
829 | + | |
830 | + public void setPresentIllness(String presentIllness) { | |
831 | + this.presentIllness = presentIllness; | |
832 | + } | |
833 | + | |
834 | + public static long getSerialVersionUID() { | |
835 | + return serialVersionUID; | |
836 | + } | |
837 | + | |
822 | 838 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java
View file @
f7e4fcb
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
f7e4fcb
... | ... | @@ -26,8 +26,6 @@ |
26 | 26 | import com.lyms.platform.operate.web.utils.CommonsHelper; |
27 | 27 | import com.lyms.platform.operate.web.utils.JdbcUtil; |
28 | 28 | import com.lyms.platform.operate.web.worker.BatchUpdateLymsPatient; |
29 | -import com.lyms.platform.operate.web.worker.CorrectDataWorker; | |
30 | -import com.lyms.platform.operate.web.worker.SyncV2HistoryWorkerx; | |
31 | 29 | import com.lyms.platform.permission.dao.master.CouponMapper; |
32 | 30 | import com.lyms.platform.permission.dao.master.MasterOrganizationMapper; |
33 | 31 | import com.lyms.platform.permission.model.*; |
34 | 32 | |
... | ... | @@ -36,11 +34,7 @@ |
36 | 34 | import com.lyms.platform.permission.service.UsersService; |
37 | 35 | import com.lyms.platform.pojo.*; |
38 | 36 | import com.lyms.platform.query.*; |
39 | -import com.mongodb.WriteResult; | |
40 | 37 | import org.apache.commons.collections.CollectionUtils; |
41 | -import org.apache.commons.dbutils.QueryRunner; | |
42 | -import org.apache.commons.dbutils.handlers.BeanListHandler; | |
43 | -import org.apache.lucene.util.CollectionUtil; | |
44 | 38 | import org.slf4j.Logger; |
45 | 39 | import org.slf4j.LoggerFactory; |
46 | 40 | import org.springframework.beans.factory.annotation.Autowired; |
47 | 41 | |
... | ... | @@ -49,13 +43,8 @@ |
49 | 43 | import org.springframework.data.mongodb.core.MongoTemplate; |
50 | 44 | import org.springframework.data.mongodb.core.query.Criteria; |
51 | 45 | import org.springframework.data.mongodb.core.query.Query; |
52 | -import org.springframework.data.mongodb.core.query.Update; | |
53 | -import org.springframework.http.HttpHeaders; | |
54 | -import org.springframework.http.MediaType; | |
55 | -import org.springframework.http.ResponseEntity; | |
56 | 46 | import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; |
57 | 47 | import org.springframework.stereotype.Component; |
58 | -import org.springframework.transaction.annotation.Transactional; | |
59 | 48 | import org.springframework.web.client.RestTemplate; |
60 | 49 | import org.springframework.web.multipart.MultipartFile; |
61 | 50 | |
62 | 51 | |
... | ... | @@ -64,13 +53,15 @@ |
64 | 53 | import java.io.File; |
65 | 54 | import java.io.IOException; |
66 | 55 | import java.io.OutputStream; |
67 | -import java.sql.*; | |
56 | +import java.sql.Connection; | |
57 | +import java.sql.DriverManager; | |
58 | +import java.sql.SQLException; | |
68 | 59 | import java.text.SimpleDateFormat; |
69 | 60 | import java.util.*; |
70 | -import java.util.Date; | |
71 | -import java.util.concurrent.*; | |
72 | -import java.util.concurrent.atomic.AtomicLong; | |
73 | -import java.util.regex.Pattern; | |
61 | +import java.util.concurrent.ExecutorService; | |
62 | +import java.util.concurrent.LinkedBlockingQueue; | |
63 | +import java.util.concurrent.ThreadPoolExecutor; | |
64 | +import java.util.concurrent.TimeUnit; | |
74 | 65 | |
75 | 66 | /** |
76 | 67 | * |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyPsychologistRequest.java
View file @
f7e4fcb
... | ... | @@ -180,6 +180,9 @@ |
180 | 180 | //刺激过低或过高反应 |
181 | 181 | private String cjfy; |
182 | 182 | |
183 | + //初诊页面的现病史 | |
184 | + private String presentIllness; | |
185 | + | |
183 | 186 | public String getCjfy() { |
184 | 187 | return cjfy; |
185 | 188 | } |
... | ... | @@ -794,6 +797,14 @@ |
794 | 797 | |
795 | 798 | public void setHandlingOpinions(String handlingOpinions) { |
796 | 799 | this.handlingOpinions = handlingOpinions; |
800 | + } | |
801 | + | |
802 | + public String getPresentIllness() { | |
803 | + return presentIllness; | |
804 | + } | |
805 | + | |
806 | + public void setPresentIllness(String presentIllness) { | |
807 | + this.presentIllness = presentIllness; | |
797 | 808 | } |
798 | 809 | } |