jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c11a3e09c008bc86861341d839aa2a8d8cbb1c75

Authored by jiangjiazhi
2 parents ba30e9ca32 61dafb344d
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 6 changed files

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ c11a3e0
... ... @@ -9,6 +9,7 @@
9 9 import org.apache.commons.collections.CollectionUtils;
10 10 import org.springframework.data.mongodb.core.query.Criteria;
11 11  
  12 +import java.util.ArrayList;
12 13 import java.util.Arrays;
13 14 import java.util.Date;
14 15 import java.util.List;
... ... @@ -291,6 +292,7 @@
291 292 * 高危因素
292 293 */
293 294 private String rFactor;
  295 + private boolean norFactor;
294 296  
295 297  
296 298 /**
... ... @@ -333,6 +335,14 @@
333 335 //建档医生
334 336 private String bookbuildingDoctor;
335 337  
  338 + public boolean isNorFactor() {
  339 + return norFactor;
  340 + }
  341 +
  342 + public void setNorFactor(boolean norFactor) {
  343 + this.norFactor = norFactor;
  344 + }
  345 +
336 346 public boolean isLastCheckEId() {
337 347 return lastCheckEId;
338 348 }
... ... @@ -878,6 +888,11 @@
878 888  
879 889 if (StringUtils.isNotEmpty(rFactor)) {
880 890 condition = condition.and("riskFactorId", rFactor, MongoOper.LIKE);
  891 + }
  892 + else if(norFactor){
  893 + condition = condition.and("riskFactorId", new ArrayList<String>(), MongoOper.NE);
  894 + MongoCondition c = MongoCondition.newInstance();
  895 + c1= c.andCondition(MongoCondition.newInstance("riskFactorId", null, MongoOper.NE)).getCriteria();
881 896 }
882 897 if (-1 != yn) {
883 898 condition = condition.and("yn", yn, MongoOper.IS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java View file @ c11a3e0
... ... @@ -55,17 +55,18 @@
55 55 // antExChuQuery.setNextCheckTimeEnd(yuYueDate);
56 56 // antExChuQuery.setHospitalId("242");
57 57  
58   - patientsQuery1.setLastCheckEId(true);
59 58 patientsQuery1.setHospitalId("242");
60   - patientsQuery1.setType(1);
61   -
62   - Date yuYueDate = DateUtil.addDay(new Date(), 2);
63   - if (yuYueDate != null) {
64   - //把时间格式化成 yyyy_MM_dd 的日期
65   - yuYueDate = DateUtil.formatDate(yuYueDate);
66   - }
67   - patientsQuery1.setDueDateStart(yuYueDate);
68   - patientsQuery1.setDueDateEnd(yuYueDate);
  59 + patientsQuery1.setNorFactor(true);
  60 + patientsQuery1.setrLevel("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2");
  61 +// patientsQuery1.setType(1);
  62 +//
  63 +// Date yuYueDate = DateUtil.addDay(new Date(), 2);
  64 +// if (yuYueDate != null) {
  65 +// //把时间格式化成 yyyy_MM_dd 的日期
  66 +// yuYueDate = DateUtil.formatDate(yuYueDate);
  67 +// }
  68 +// patientsQuery1.setDueDateStart(yuYueDate);
  69 +// patientsQuery1.setDueDateEnd(yuYueDate);
69 70  
70 71 System.out.println(patientsQuery1.convertToQuery().convertToMongoQuery());
71 72  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java View file @ c11a3e0
... ... @@ -69,7 +69,7 @@
69 69 param.setId(id);
70 70 }else {
71 71 param.setVcCardNo(vcCardNo);
72   - param.setCertificateNum(certificateNum);
  72 + param.setVcCardNo(certificateNum);
73 73 }
74 74 return premaritalCheckupFacade.getPremaritalCheckup(param);
75 75 }
76 76  
... ... @@ -85,9 +85,8 @@
85 85 @TokenRequired
86 86 public BaseListResponse queryPremaritalCheckup(@Valid PremaritalCheckupQueryRequest queryRequest,
87 87 HttpServletRequest request){
88   - LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
89 88  
90   - return premaritalCheckupFacade.queryPremaritalCheckup(queryRequest, loginState.getId());
  89 + return premaritalCheckupFacade.queryPremaritalCheckup(queryRequest);
91 90 }
92 91 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ c11a3e0
... ... @@ -73,10 +73,10 @@
73 73 ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
74 74  
75 75 //当婚检ID为空,用证件号或者就诊卡去查询居民建档的信息
76   - if (StringUtils.isNotEmpty(requestParam.getCertificateNum())) {
  76 + if (StringUtils.isNotEmpty(requestParam.getCardNo())) {
77 77 archiveQuery.setYn(YnEnums.YES.getId());
78 78 archiveQuery.setHospitalId(requestParam.getHospitalId());
79   - archiveQuery.setCertificateNum(requestParam.getCertificateNum());
  79 + archiveQuery.setCertificateNum(requestParam.getCardNo());
80 80 List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery);
81 81 if (CollectionUtils.isNotEmpty(modelList)) {
82 82 archiveModel = modelList.get(0);
83 83  
... ... @@ -153,10 +153,9 @@
153 153 /**
154 154 * 婚前检查管理
155 155 * @param request
156   - * @param userId
157 156 * @return
158 157 */
159   - public BaseListResponse queryPremaritalCheckup(PremaritalCheckupQueryRequest request,Integer userId){
  158 + public BaseListResponse queryPremaritalCheckup(PremaritalCheckupQueryRequest request){
160 159  
161 160 List<PremaritalCheckup> data = new ArrayList<>();
162 161  
... ... @@ -182,7 +181,7 @@
182 181 query.setLimit(request.getLimit());
183 182 query.setNeed("y");
184 183 query.setYn(YnEnums.YES.getId());
185   - query.setCertificateNum(request.getCertificateNum());
  184 + query.setCertificateNum(request.getCardNo());
186 185 query.setYiXueYiJian(request.getYiXueYiJian());
187 186 query.setPremaritalUpTimeStart(request.getPremaritalUpTimeStart());
188 187 query.setPremaritalUpTimeEnd(request.getPremaritalUpTimeEnd());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java View file @ c11a3e0
... ... @@ -95,6 +95,8 @@
95 95 //产检医生
96 96 patientsQuery.setLastCheckEmployeeId(riskPatientsQueryRequest.getLastCheckDoctorId());
97 97  
  98 + patientsQuery.setNorFactor(Boolean.TRUE);
  99 +
98 100 //总的孕妇条数
99 101 int allPatientCount = patientsService.queryPatientCount(patientsQuery);
100 102  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java View file @ c11a3e0
... ... @@ -11,7 +11,7 @@
11 11  
12 12 private String id;
13 13 //证件号
14   - private String certificateNum;
  14 + private String cardNo;
15 15 //就诊卡
16 16 private String vcCardNo;
17 17 //妇女姓名
18 18  
... ... @@ -43,12 +43,12 @@
43 43 this.id = id;
44 44 }
45 45  
46   - public String getCertificateNum() {
47   - return certificateNum;
  46 + public String getCardNo() {
  47 + return cardNo;
48 48 }
49 49  
50   - public void setCertificateNum(String certificateNum) {
51   - this.certificateNum = certificateNum;
  50 + public void setCardNo(String cardNo) {
  51 + this.cardNo = cardNo;
52 52 }
53 53  
54 54 public String getVcCardNo() {