jiangjiazhi / regional-platform

Download as
Browse Code »

Commit dff8dc183fb5a55195d0d23c328ee1b74ddd8240

Authored by liquanyu
2 parents bc2959c8b6 4dfebff899
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge branch 'master' of https://git.healthbaby.com.cn/jiangjiazhi/regional-platform

Showing 7 changed files

platform-common/src/main/java/com/lyms/platform/common/result/BaseObjectResponse.java View file @ dff8dc1
... ... @@ -17,8 +17,13 @@
17 17 return pageInfo;
18 18 }
19 19  
20   - public void setPageInfo(PageInfo pageInfo) {
  20 +// public void setPageInfo(PageInfo pageInfo) {
  21 +// this.pageInfo = pageInfo;
  22 +// }
  23 +
  24 + public BaseObjectResponse setPageInfo(PageInfo pageInfo) {
21 25 this.pageInfo = pageInfo;
  26 + return this;
22 27 }
23 28  
24 29 public Object getData() {
platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java View file @ dff8dc1
... ... @@ -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-dal/src/main/java/com/lyms/platform/pojo/TemporaryUserModel.java View file @ dff8dc1
... ... @@ -19,7 +19,7 @@
19 19 private Date birth;
20 20  
21 21 @FormParam
22   - @NotEmpty(message = "生日不能为空.")
  22 +// @NotEmpty(message = "生日不能为空.")
23 23 private String birthday;
24 24  
25 25 private String phone;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java View file @ dff8dc1
... ... @@ -157,6 +157,7 @@
157 157 model.setAso(request.getAso());
158 158 model.setFzOther(request.getFzOther());
159 159 model.setCjfy(request.getCjfy());
  160 + model.setPresentIllness(request.getPresentIllness());
160 161 return model;
161 162  
162 163 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ dff8dc1
... ... @@ -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/facade/PostReviewFacade.java View file @ dff8dc1
... ... @@ -591,7 +591,7 @@
591 591 datas.add(data);
592 592 }
593 593 }
594   - return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(datas);
  594 + return new BaseObjectResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS).setData(datas).setPageInfo(postReviewStatusQuery.getPageInfo());
595 595  
596 596 }
597 597  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPsychologistResult.java View file @ dff8dc1
... ... @@ -182,6 +182,9 @@
182 182 //刺激过低或过高反应
183 183 private String cjfy;
184 184  
  185 + //初诊页面的现病史
  186 + private String presentIllness;
  187 +
185 188 public String getCjfy() {
186 189 return cjfy;
187 190 }
... ... @@ -830,6 +833,14 @@
830 833 this.mHighRiskReason = mHighRiskReason;
831 834 }
832 835  
  836 + public String getPresentIllness() {
  837 + return presentIllness;
  838 + }
  839 +
  840 + public void setPresentIllness(String presentIllness) {
  841 + this.presentIllness = presentIllness;
  842 + }
  843 +
833 844 @Override
834 845 public BabyPsychologistResult convertToResult(BabyPsychologistModel destModel) {
835 846  
... ... @@ -939,6 +950,7 @@
939 950 setAso(destModel.getAso());
940 951 setFzOther(destModel.getFzOther());
941 952 setCjfy(destModel.getCjfy());
  953 + setPresentIllness(destModel.getPresentIllness());
942 954  
943 955 return this;
944 956 }