jiangjiazhi / regional-platform

Download as
Browse Code »

Commit ea213ea9e1bd81db96d9c966de6b3d141ce38043

Authored by yangfei
1 parent c3e2fe62ec
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

查询号条件

Showing 25 changed files with 435 additions and 113 deletions

platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java View file @ ea213ea
... ... @@ -6,7 +6,7 @@
6 6 import com.lyms.platform.common.dao.operator.MongoOper;
7 7 import com.lyms.platform.common.dao.operator.MongoQuery;
8 8 import com.lyms.platform.common.utils.StringUtils;
9   -import com.sun.org.apache.xpath.internal.operations.Bool;
  9 +import org.apache.commons.collections.CollectionUtils;
10 10 import org.springframework.data.mongodb.core.query.Criteria;
11 11  
12 12 import java.util.Date;
13 13  
14 14  
... ... @@ -23,14 +23,11 @@
23 23 private String cardNo;
24 24 private String phone;
25 25 private String barCode;
26   -
27 26 private Boolean NeNullCheckDoctor;
28   -
29 27 /**
30 28 * 末次月经
31 29 */
32 30 private Date lastMensesStart;
33   -
34 31 /**
35 32 * 末次月经
36 33 */
37 34  
38 35  
... ... @@ -38,8 +35,17 @@
38 35 //产检孕周
39 36 private Integer cDueWeekStart;
40 37 private Integer cDueWeekEnd;
  38 + //患者ID
  39 + private List<String> parentIds;
41 40  
  41 + public List<String> getParentIds() {
  42 + return parentIds;
  43 + }
42 44  
  45 + public void setParentIds(List<String> parentIds) {
  46 + this.parentIds = parentIds;
  47 + }
  48 +
43 49 public Integer getcDueWeekStart() {
44 50 return cDueWeekStart;
45 51 }
46 52  
... ... @@ -353,13 +359,16 @@
353 359 public MongoQuery convertToQuery() {
354 360 MongoCondition condition = MongoCondition.newInstance();
355 361  
  362 + if(CollectionUtils.isNotEmpty(parentIds)){
  363 + condition = condition.and("parentId", parentIds, MongoOper.IN);
  364 + }
356 365 if (null != pid) {
357 366 condition = condition.and("pid", pid, MongoOper.IS);
358 367 }
359 368 if (null != parentId) {
360 369 condition = condition.and("parentId", parentId, MongoOper.IS);
361 370 }
362   - if (StringUtils.isNotEmpty( cardNo)) {
  371 + if (StringUtils.isNotEmpty(cardNo)) {
363 372 condition = condition.and("cardNo", cardNo, MongoOper.IS);
364 373 }
365 374 if (StringUtils.isNotEmpty(phone)) {
... ... @@ -369,7 +378,7 @@
369 378 condition = condition.and("id", id, MongoOper.IS);
370 379 }
371 380  
372   - if (StringUtils.isNotEmpty(name) ) {
  381 + if (StringUtils.isNotEmpty(name)) {
373 382 condition = condition.and("name", name, MongoOper.IS);
374 383 }
375 384 if (null != NeNullCheckDoctor) {
... ... @@ -388,7 +397,7 @@
388 397 if (StringUtils.isNotEmpty(cId)) {
389 398 condition = condition.and("checkDoctor", cId, MongoOper.IS);
390 399 }
391   - if (StringUtils.isNotEmpty( fId)) {
  400 + if (StringUtils.isNotEmpty(fId)) {
392 401 condition = condition.and("fId", fId, MongoOper.IS);
393 402 }
394 403  
... ... @@ -419,7 +428,6 @@
419 428 if (null != hospitalList) {
420 429 condition = condition.and("hospitalId", hospitalList, MongoOper.IN);
421 430 }
422   -
423 431  
424 432  
425 433 Criteria c = null;
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ ea213ea
... ... @@ -623,11 +623,13 @@
623 623 condition = condition.orCondition(new MongoCondition[]{condition1, condition2});
624 624 }
625 625  
626   - if (null != queryNo) {
  626 + if (StringUtils.isNotEmpty(queryNo)){
  627 + MongoCondition c = MongoCondition.newInstance();
627 628 MongoCondition con1 = MongoCondition.newInstance("mname", queryNo, MongoOper.IS);
628 629 MongoCondition con2 = MongoCondition.newInstance("mcertNo", queryNo, MongoOper.IS);
629 630 MongoCondition con3 = MongoCondition.newInstance("mphone", queryNo, MongoOper.IS);
630   - condition = condition.orCondition(new MongoCondition[]{con1, con2, con3});
  631 + MongoCondition con4 = MongoCondition.newInstance("name", queryNo, MongoOper.IS);
  632 + condition = condition.andCondition(c.orCondition(new MongoCondition[]{con1, con2, con3,con4}));
631 633 }
632 634  
633 635 if (null != sex) {
platform-dal/src/main/java/com/lyms/platform/query/FolicAcidQuery.java View file @ ea213ea
... ... @@ -50,10 +50,24 @@
50 50  
51 51 //医院id
52 52 private List<String> hospitalList;
  53 + //患者ID
  54 + private List<String> parentIds;
53 55  
  56 + public List<String> getParentIds() {
  57 + return parentIds;
  58 + }
  59 +
  60 + public void setParentIds(List<String> parentIds) {
  61 + this.parentIds = parentIds;
  62 + }
54 63 @Override
55 64 public MongoQuery convertToQuery() {
56 65 MongoCondition condition = MongoCondition.newInstance();
  66 +
  67 + if(CollectionUtils.isNotEmpty(parentIds)){
  68 + condition = condition.and("parentId", parentIds, MongoOper.IN);
  69 + }
  70 +
57 71 if (StringUtils.isNotBlank(id)) {
58 72 condition = condition.and("id", id, MongoOper.IS);
59 73 }
platform-dal/src/main/java/com/lyms/platform/query/LisCrisisItemQuery.java View file @ ea213ea
... ... @@ -5,11 +5,11 @@
5 5 import com.lyms.platform.common.dao.operator.MongoCondition;
6 6 import com.lyms.platform.common.dao.operator.MongoOper;
7 7 import com.lyms.platform.common.dao.operator.MongoQuery;
  8 +import org.apache.commons.collections.CollectionUtils;
8 9 import org.apache.commons.lang.StringUtils;
9   -import org.bson.types.ObjectId;
10 10 import org.springframework.data.mongodb.core.query.Criteria;
11 11  
12   -import java.util.Date;
  12 +import java.util.List;
13 13  
14 14 /**
15 15 * Created by Administrator on 2016/10/19 0019.
16 16  
... ... @@ -36,7 +36,17 @@
36 36 private Integer startWeek;
37 37 private Integer endWeek;
38 38 private Integer age;
  39 + //患者ID
  40 + private List<String> parentIds;
39 41  
  42 + public List<String> getParentIds() {
  43 + return parentIds;
  44 + }
  45 +
  46 + public void setParentIds(List<String> parentIds) {
  47 + this.parentIds = parentIds;
  48 + }
  49 +
40 50 public Integer getAge() {
41 51 return age;
42 52 }
... ... @@ -192,6 +202,10 @@
192 202 @Override
193 203 public MongoQuery convertToQuery() {
194 204 MongoCondition condition = MongoCondition.newInstance();
  205 +
  206 + if(CollectionUtils.isNotEmpty(parentIds)){
  207 + condition = condition.and("patientId", parentIds, MongoOper.IN);
  208 + }
195 209 if (StringUtils.isNotBlank(id)) {
196 210 condition = condition.and("id", id, MongoOper.IS);
197 211 }
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ ea213ea
... ... @@ -119,7 +119,13 @@
119 119 private String source;
120 120  
121 121 private String desc;
  122 + //查询号
  123 + private String queryNo;
122 124  
  125 + private String phoneOrCert;
  126 + private String[] pc;
  127 + private String[] pv;
  128 +
123 129 public List<String> getIds() {
124 130 return ids;
125 131 }
... ... @@ -215,13 +221,6 @@
215 221 public void setHospitalList(List<String> hospitalList) {
216 222 this.hospitalList = hospitalList;
217 223 }
218   -
219   - //查询号
220   - private String queryNo;
221   -
222   - private String phoneOrCert;
223   - private String[] pc;
224   - private String[] pv;
225 224  
226 225 public String[] getPv() {
227 226 return pv;
platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java View file @ ea213ea
... ... @@ -6,6 +6,7 @@
6 6 import com.lyms.platform.common.dao.operator.MongoOper;
7 7 import com.lyms.platform.common.dao.operator.MongoQuery;
8 8 import com.lyms.platform.common.utils.StringUtils;
  9 +import org.apache.commons.collections.CollectionUtils;
9 10 import org.springframework.data.mongodb.core.query.Criteria;
10 11  
11 12 import java.util.ArrayList;
12 13  
... ... @@ -85,7 +86,28 @@
85 86 * 末次月经
86 87 */
87 88 private Date lastMensesEnd;
  89 + //患者ID
  90 + private List<String> parentIds;
88 91  
  92 + //查询号
  93 + private String queryNo;
  94 +
  95 + public String getQueryNo() {
  96 + return queryNo;
  97 + }
  98 +
  99 + public void setQueryNo(String queryNo) {
  100 + this.queryNo = queryNo;
  101 + }
  102 +
  103 + public List<String> getParentIds() {
  104 + return parentIds;
  105 + }
  106 +
  107 + public void setParentIds(List<String> parentIds) {
  108 + this.parentIds = parentIds;
  109 + }
  110 +
89 111 public Integer getStatus() {
90 112 return status;
91 113 }
... ... @@ -289,6 +311,11 @@
289 311 @Override
290 312 public MongoQuery convertToQuery() {
291 313 MongoCondition condition = MongoCondition.newInstance();
  314 +
  315 + if(CollectionUtils.isNotEmpty(parentIds)){
  316 + condition = condition.and("parentId", parentIds, MongoOper.IN);
  317 + }
  318 +
292 319 if (null != parentId) {
293 320 condition = condition.and("parentId", parentId, MongoOper.IS);
294 321 }
... ... @@ -323,6 +350,10 @@
323 350 if (StringUtils.isNotEmpty(phone)) {
324 351 condition = condition.and("phone", phone, MongoOper.IS);
325 352 }
  353 +
  354 +
  355 +
  356 +
326 357 if (null != hospitalId) {
327 358 condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
328 359 }
... ... @@ -372,7 +403,18 @@
372 403 c = Criteria.where("created").lte(transferredEnd);
373 404 }
374 405 }
375   -
  406 + if (StringUtils.isNotEmpty(queryNo)) {
  407 + MongoCondition c1 = MongoCondition.newInstance();
  408 + MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
  409 + MongoCondition con2 = MongoCondition.newInstance("name", queryNo, MongoOper.IS);
  410 + MongoCondition con3 = MongoCondition.newInstance("mname", queryNo, MongoOper.IS);
  411 + MongoCondition con4 = MongoCondition.newInstance("mCardNo", queryNo, MongoOper.IS);
  412 + if(c!=null) {
  413 + c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria());
  414 + }else {
  415 + c = c1.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria();
  416 + }
  417 + }
376 418  
377 419 if (StringUtils.isNotEmpty(riskFactor)) {
378 420 condition = condition.and("rRisk", riskFactor, MongoOper.IN);
platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java View file @ ea213ea
... ... @@ -8,7 +8,6 @@
8 8 import org.apache.commons.lang.StringUtils;
9 9 import org.springframework.data.mongodb.core.query.Criteria;
10 10  
11   -import javax.validation.constraints.Min;
12 11 import java.util.Date;
13 12 import java.util.List;
14 13  
15 14  
16 15  
17 16  
... ... @@ -109,17 +108,27 @@
109 108 private Integer ageMax;
110 109  
111 110 private List<String> hospitalIds;
  111 + private String queryNo;
112 112  
  113 + public String getQueryNo() {
  114 + return queryNo;
  115 + }
  116 +
  117 + public void setQueryNo(String queryNo) {
  118 + this.queryNo = queryNo;
  119 + }
  120 +
113 121 @Override
114 122 public MongoQuery convertToQuery() {
115 123 MongoCondition condition = MongoCondition.newInstance();
  124 +
116 125 if (StringUtils.isNotBlank(id)) {
117 126 condition = condition.and("id", id, MongoOper.IS);
118 127 }
119 128 if (StringUtils.isNotBlank(username)) {
120 129 condition = condition.and("username", username, MongoOper.LIKE);
121 130 }
122   - if (hospitalIds!=null) {
  131 + if (hospitalIds != null) {
123 132 condition = condition.and("hospitalId", hospitalIds, MongoOper.IN);
124 133 }
125 134 if (StringUtils.isNotBlank(phone)) {
126 135  
... ... @@ -155,10 +164,10 @@
155 164 if (StringUtils.isNotBlank(vcCardNo)) {
156 165 condition = condition.and("vcCardNo", vcCardNo, MongoOper.IS);
157 166 }
158   - if (yn !=null) {
  167 + if (yn != null) {
159 168 condition = condition.and("yn", yn, MongoOper.IS);
160 169 }
161   - if (created !=null) {
  170 + if (created != null) {
162 171 condition = condition.and("created", created, MongoOper.IS);
163 172 }
164 173 if (StringUtils.isNotBlank(buildDoctor)) {
165 174  
166 175  
167 176  
168 177  
... ... @@ -168,28 +177,41 @@
168 177 condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
169 178 }
170 179 Criteria c1 = null;
171   - if(null!=birthdayStart){
  180 + if (null != birthdayStart) {
172 181 c1 = Criteria.where("birthday").gte(birthdayStart);
173 182 }
174   - if(null!=birthdayEnd){
175   - if (null==c1) {
  183 + if (null != birthdayEnd) {
  184 + if (null == c1) {
176 185 c1 = Criteria.where("birthday").lte(birthdayEnd);
177 186 } else {
178 187 c1 = c1.lte(birthdayEnd);
179 188 }
180 189 }
181   - if (null!=ageMin){
  190 + if (null != ageMin) {
182 191 c1 = Criteria.where("age").gte(ageMin);
183 192 }
184   - if(null!=ageMax){
185   - if (null==c1) {
  193 + if (null != ageMax) {
  194 + if (null == c1) {
186 195 c1 = Criteria.where("age").lte(ageMax);
187 196 } else {
188 197 c1 = c1.lte(ageMax);
189 198 }
190 199 }
191 200  
192   - if (c1!=null) {
  201 + if (StringUtils.isNotBlank(queryNo)) {
  202 + MongoCondition c = MongoCondition.newInstance();
  203 + MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
  204 + MongoCondition con2 = MongoCondition.newInstance("username", queryNo, MongoOper.IS);
  205 + MongoCondition con3 = MongoCondition.newInstance("vcCardNo", queryNo, MongoOper.IS);
  206 + if(c1!=null) {
  207 + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria());
  208 + }else {
  209 + c1 = c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria();
  210 + }
  211 + //condition = condition.and("id", id, MongoOper.IS).orCondition();
  212 + }
  213 +
  214 + if (c1 != null) {
193 215 condition = condition.andCondition(new MongoCondition(c1));
194 216 }
195 217 return condition.toMongoQuery();
platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java View file @ ea213ea
... ... @@ -58,6 +58,20 @@
58 58 */
59 59 private Date lastMensesEnd;
60 60  
  61 + //是否通知
  62 + private Integer isNotify;
  63 + //查询号
  64 + private String queryNo;
  65 +
  66 + public String getQueryNo() {
  67 + return queryNo;
  68 + }
  69 +
  70 + public void setQueryNo(String queryNo) {
  71 + this.queryNo = queryNo;
  72 + }
  73 +
  74 +
61 75 public String getFrom() {
62 76 return from;
63 77 }
... ... @@ -66,8 +80,6 @@
66 80 this.from = from;
67 81 }
68 82  
69   - //是否通知
70   - private Integer isNotify;
71 83  
72 84 public Integer getRenShenResult() {
73 85 return renShenResult;
... ... @@ -215,6 +227,17 @@
215 227 c1 = c1.lte(dueWeekEnd);
216 228 } else {
217 229 c1 = Criteria.where("dueWeek").lte(dueWeekEnd);
  230 + }
  231 + }
  232 +
  233 + if (StringUtils.isNotEmpty(queryNo)) {
  234 + MongoCondition c = MongoCondition.newInstance();
  235 + MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
  236 + MongoCondition con2 = MongoCondition.newInstance("name", queryNo, MongoOper.IS);
  237 + if(c1!=null) {
  238 + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
  239 + }else {
  240 + c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
218 241 }
219 242 }
220 243  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ ea213ea
... ... @@ -18,7 +18,6 @@
18 18 import com.lyms.platform.operate.web.result.QueryHospitalListRequest;
19 19 import com.lyms.platform.operate.web.result.QueryHospitalListResult;
20 20 import com.lyms.platform.permission.service.CouponService;
21   -import com.lyms.platform.pojo.BabyModel;
22 21 import org.apache.log4j.Logger;
23 22 import org.springframework.beans.factory.annotation.Autowired;
24 23 import org.springframework.data.mongodb.core.MongoTemplate;
... ... @@ -184,6 +183,7 @@
184 183 @ResponseBody
185 184 @TokenRequired
186 185 public BaseListResponse queryBabyList(HttpServletRequest httpServletRequest,
  186 + @RequestParam(value = "queryNo", required = false) String queryNo,
187 187 @RequestParam(value = "mcardNo", required = false) String mcardNo,
188 188 @RequestParam(value = "bcardNo", required = false) String bcardNo,
189 189 @RequestParam(value = "mphone", required = false) String mphone,
190 190  
... ... @@ -210,7 +210,9 @@
210 210 @RequestParam(value = "hospitalId",required = false) String hospitalId,
211 211 @RequestParam(value = "isArea",required = false) String isArea){
212 212 LoginContext loginState = (LoginContext) httpServletRequest.getAttribute("loginContext");
  213 +
213 214 BabyManageRequest request = new BabyManageRequest();
  215 + request.setQueryNo(queryNo);
214 216 request.setBcardNo(bcardNo);
215 217 request.setMcardNo(mcardNo);
216 218 request.setMphone(mphone);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HighriskChangeHospitalController.java View file @ ea213ea
... ... @@ -12,6 +12,7 @@
12 12 import com.lyms.platform.operate.web.result.FrontEndResult;
13 13 import com.lyms.platform.operate.web.result.HighriskChangeHospitalListResult;
14 14 import com.lyms.platform.operate.web.result.HighriskChangeHospitalOneResult;
  15 +import com.lyms.platform.operate.web.utils.ResponseUtil;
15 16 import com.lyms.platform.permission.model.*;
16 17 import com.lyms.platform.permission.service.BabyPatientExtendEarScreenService;
17 18 import com.lyms.platform.permission.service.HighriskChangeHospitalService;
... ... @@ -27,6 +28,7 @@
27 28 import org.springframework.web.bind.annotation.ResponseBody;
28 29  
29 30 import javax.servlet.http.HttpServletRequest;
  31 +import javax.servlet.http.HttpServletResponse;
30 32 import java.util.*;
31 33  
32 34 /**
33 35  
34 36  
35 37  
... ... @@ -63,31 +65,65 @@
63 65 * @return
64 66 */
65 67 @RequestMapping(method = RequestMethod.GET, value = "/exportExcel")
66   - @ResponseBody
67   - @TokenRequired
68   - public BaseResponse exportExcel(HighriskChangeHospitalQuery query, HttpServletRequest request) {
  68 + // @TokenRequired
  69 + public void exportExcel(HighriskChangeHospitalQuery query, Integer type, HttpServletRequest request, HttpServletResponse resp) {
69 70 //获取当前登录用户ID
70 71 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
71 72 if (loginState == null) {
72   - return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录");
  73 + // return new BaseResponse().setErrorcode(ErrorCodeConstants.TOKEN_EXPIRE).setErrormsg("请重新登录");
73 74 }
74   - List<HighriskChangeHospital> highriskChangeHospitalList = highriskChangeHospitalService.queryHighriskChangeHospital(query);
  75 + // List<HighriskChangeHospital> highriskChangeHospitalList = highriskChangeHospitalService.queryHighriskChangeHospital(query);
75 76 Map<String, String> cnames = new LinkedHashMap<>();
76   - cnames.put("儿童姓名", "");
77   - cnames.put("母亲姓名", "");
78   - cnames.put("月龄", "");
79   - cnames.put("出生日期", "");
80   - cnames.put("筛查日期", "");
81   - cnames.put("性别", "");
82   - cnames.put("筛查类型", "");
83   - cnames.put("筛查结果", "");
84   - cnames.put("转诊医生", "");
85   - cnames.put("转诊日期", "");
86   - cnames.put("转出医院", "");
87   - cnames.put("联系电话", "");
88   - cnames.put("接受日期", "");
89   - cnames.put("状态", "");
90   - return null;
  77 + cnames.put("id", "#");
  78 + cnames.put("babyName", "儿童姓名");
  79 + cnames.put("mommyName", "母亲姓名");
  80 + cnames.put("monthAge", "月龄");
  81 + cnames.put("birthday", "出生日期");
  82 + cnames.put("screenTime", "筛查日期");
  83 + cnames.put("sex", "性别");
  84 + cnames.put("screenType", "筛查类型");
  85 + cnames.put("isPass", "筛查结果");
  86 + cnames.put("doctorName", "转诊医生");
  87 + cnames.put("createTime", "转诊日期");
  88 + cnames.put("hospitalName", "转出医院");
  89 + cnames.put("mommnyPhone", "联系电话");
  90 + cnames.put("receiveTime", "接受日期");
  91 + cnames.put("status", "状态");
  92 + //医院id
  93 + String hospitalId = "216";
  94 + if (type != null && type == 1) {//转出
  95 + query.setOutOrgid(hospitalId);
  96 + } else if (type != null && type == 0) {//转入儿童
  97 + query.setIntoOrgid(hospitalId);
  98 + } else {
  99 + // return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入查询类型");
  100 + }
  101 + //医院id
  102 + List<HighriskChangeHospital> hchList = highriskChangeHospitalService.queryHighriskChangeHospital(query);
  103 + List<HighriskChangeHospitalListResult> hchResList = disposeHighriskChange(hchList, type);
  104 +
  105 + List<Map<String, Object>> results = new ArrayList<>();
  106 + for (int i =0;i<hchResList.size();i++) {
  107 + HighriskChangeHospitalListResult ch = hchResList.get(i);
  108 + Map<String, Object> result = new LinkedHashMap<>();
  109 + result.put("id", i + 1);
  110 + result.put("babyName", ch.getBabyName());
  111 + result.put("mommyName", ch.getMommyName());
  112 + result.put("monthAge", ch.getMonthAge());
  113 + result.put("birthday", ch.getBirthday());
  114 + result.put("screenTime", ch.getScreenTime());
  115 + result.put("sex", ch.getSex());
  116 + result.put("screenType", ch.getScreenType());
  117 + result.put("isPass", ch.getIsPass());
  118 + result.put("doctorName", ch.getDoctorName());
  119 + result.put("createTime", ch.getCreateTime());
  120 + result.put("hospitalName", ch.getHospitalName());
  121 + result.put("mommnyPhone", ch.getMommnyPhone());
  122 + result.put("receiveTime", ch.getReceiveTime());
  123 + result.put("status", ch.getStatus());
  124 + results.add(result);
  125 + }
  126 + ResponseUtil.responseExcel(cnames,results, resp);
91 127 }
92 128  
93 129 /**
... ... @@ -110,7 +146,7 @@
110 146 String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
111 147 //医院id
112 148 HighriskChangeHospital hc = highriskChangeHospitalService.getHighriskChangeHospital(chId);
113   - if(hc==null){
  149 + if (hc == null) {
114 150 return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有找到数据");
115 151 }
116 152 HighriskChangeHospitalOneResult hcOne = new HighriskChangeHospitalOneResult();
117 153  
118 154  
... ... @@ -189,13 +225,13 @@
189 225 if ((abarLeft != null && abarLeft == -1) || (abarRight != null && abarRight == -1)) {
190 226 scrRes = false;
191 227 }
192   - if(oaeLeft != null||oaeRight != null){
  228 + if (oaeLeft != null || oaeRight != null) {
193 229 screenMethod = "OAE";
194 230 }
195   - if(abarLeft != null||abarRight != null){
  231 + if (abarLeft != null || abarRight != null) {
196 232 if (StringUtils.isNotEmpty(screenMethod)) {
197 233 screenMethod = "OAE、AABR";
198   - }else{
  234 + } else {
199 235 screenMethod = "AABR";
200 236 }
201 237 }
202 238  
... ... @@ -235,9 +271,15 @@
235 271 //医院id
236 272 List<HighriskChangeHospital> hchList = highriskChangeHospitalService.queryHighriskChangeHospital(query);
237 273  
  274 + List<HighriskChangeHospitalListResult> results = disposeHighriskChange(hchList, type);
  275 + return FrontEndResult.ini().setData(results).setPageInfo(query.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
  276 + }
  277 +
  278 + public List<HighriskChangeHospitalListResult> disposeHighriskChange(List<HighriskChangeHospital> hchList, Integer type) {
238 279 List<HighriskChangeHospitalListResult> results = new ArrayList<>();
239 280 for (HighriskChangeHospital hc : hchList) {
240 281 HighriskChangeHospitalListResult rs = new HighriskChangeHospitalListResult();
  282 + rs.setCreateTime(DateUtil.getyyyy_MM_dd(hc.getCreateTime()));
241 283 rs.setId(hc.getId());
242 284 // 状态：1待接收，2已接收
243 285 Integer status = hc.getStatus();
... ... @@ -283,6 +325,7 @@
283 325  
284 326 BabyPatientExtendEarScreen screent = screenService.getBabyPatientExtendEarScreen(hc.getScrreenId());
285 327 if (screent != null) {
  328 + rs.setScreenTime(DateUtil.getyyyy_MM_dd(screent.getScreenDate()));
286 329 //1=初筛 2=复筛
287 330 Integer screenType = screent.getScreenType();
288 331 Integer oaeLeft = screent.getOaeLeft();
... ... @@ -312,7 +355,7 @@
312 355 }
313 356 results.add(rs);
314 357 }
315   - return FrontEndResult.ini().setData(results).setPageInfo(query.getPageInfo()).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("查询成功");
  358 + return results;
316 359 }
317 360  
318 361 /**
... ... @@ -447,7 +490,7 @@
447 490 if (StringUtil.isBlank(obj.getTargetId())) {
448 491 return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请传入儿童档案id");
449 492 }
450   - obj.setApplyDoctorid(String.valueOf(loginState.getId()));
  493 + // obj.setApplyDoctorid(String.valueOf(loginState.getId()));
451 494 obj.setTargetType(2);//儿童
452 495 obj.setCreateTime(new Date());
453 496 obj.setOutOrgid(hospitalId);//转出医院id
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisCrisisItemController.java View file @ ea213ea
1 1 package com.lyms.platform.operate.web.controller;
2 2  
3   -import com.lyms.platform.biz.dal.LisCrisisItemDao;
4 3 import com.lyms.platform.biz.service.EmergenceTreatmentService;
5 4 import com.lyms.platform.biz.service.LisCrisisItemService;
  5 +import com.lyms.platform.biz.service.PatientsService;
6 6 import com.lyms.platform.common.annotation.TokenRequired;
7 7 import com.lyms.platform.common.base.BaseController;
8   -import com.lyms.platform.common.constants.ErrorCodeConstants;
9   -import com.lyms.platform.common.enums.YnEnums;
10 8 import com.lyms.platform.common.result.CommonResult;
11 9 import com.lyms.platform.common.utils.DateUtil;
12   -import com.lyms.platform.common.utils.JsonUtil;
13 10 import com.lyms.platform.common.utils.ResultUtils;
14   -import com.lyms.platform.pojo.EmergenceTreatmentModel;
  11 +import com.lyms.platform.common.utils.StringUtils;
15 12 import com.lyms.platform.pojo.LisCrisisItem;
16   -import com.lyms.platform.query.EmergenceTreatmentQuery;
  13 +import com.lyms.platform.pojo.Patients;
17 14 import com.lyms.platform.query.LisCrisisItemQuery;
  15 +import com.lyms.platform.query.PatientsQuery;
18 16 import org.apache.commons.collections.CollectionUtils;
19 17 import org.springframework.beans.factory.annotation.Autowired;
20 18 import org.springframework.stereotype.Controller;
... ... @@ -38,6 +36,8 @@
38 36  
39 37 @Autowired
40 38 private EmergenceTreatmentService emergenceTreatmentService;
  39 + @Autowired
  40 + private PatientsService patientsService;
41 41  
42 42  
43 43 @RequestMapping(value = "/lisCrisisItems", method = RequestMethod.GET)
... ... @@ -45,6 +45,7 @@
45 45 public void getEmergenceTreatments(HttpServletResponse response,
46 46 @RequestParam("page") int page,
47 47 @RequestParam("limit") int limit,
  48 + @RequestParam(value = "queryNo",required = false) String queryNo,
48 49 @RequestParam(value = "id", required = false) String id,
49 50 @RequestParam(value = "cardNo", required = false) String cardNo,
50 51 @RequestParam(value = "phone", required = false) String phone,
... ... @@ -56,6 +57,14 @@
56 57 @RequestParam(value = "refer", required = false) String refer,
57 58 @RequestParam(value = "doctor", required = false) String doctor
58 59 ) {
  60 +
  61 + PatientsQuery patientsQuery = new PatientsQuery();
  62 + List<Patients> patientses = null;
  63 + if (StringUtils.isNotEmpty(queryNo)) {
  64 + patientsQuery.setQueryNo(queryNo);
  65 + patientses = patientsService.queryPatient1(patientsQuery, "modified");
  66 + }
  67 +
59 68 LisCrisisItemQuery query = new LisCrisisItemQuery();
60 69 query.setPage(page);
61 70 query.setLimit(limit);
... ... @@ -70,6 +79,15 @@
70 79 query.setStatus(status);
71 80 query.setItemName(refer);
72 81 query.setApplyDoctorName(doctor);
  82 +
  83 + if (CollectionUtils.isNotEmpty(patientses)) {
  84 + List<String> parentIds = new LinkedList<>();
  85 + for(Patients pa:patientses){
  86 + parentIds.add(pa.getId());
  87 + }
  88 + query.setParentIds(parentIds);
  89 + }
  90 +
73 91 List<LisCrisisItem> lisCrisisItemList = lisCrisisItemService.query(query);
74 92  
75 93 List<Map> list = new ArrayList<>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ ea213ea
... ... @@ -2,11 +2,13 @@
2 2  
3 3 import com.lyms.platform.biz.service.*;
4 4 import com.lyms.platform.common.constants.ErrorCodeConstants;
5   -import com.lyms.platform.common.enums.*;
  5 +import com.lyms.platform.common.enums.RiskDefaultTypeEnum;
  6 +import com.lyms.platform.common.enums.YnEnums;
6 7 import com.lyms.platform.common.result.BaseListResponse;
7   -import com.lyms.platform.common.result.BaseObjectResponse;
8 8 import com.lyms.platform.common.result.BaseResponse;
9   -import com.lyms.platform.common.utils.*;
  9 +import com.lyms.platform.common.utils.DateUtil;
  10 +import com.lyms.platform.common.utils.ExcelUtil;
  11 +import com.lyms.platform.common.utils.ExceptionUtils;
10 12 import com.lyms.platform.common.utils.StringUtils;
11 13 import com.lyms.platform.operate.web.request.AntExManagerQueryRequest;
12 14 import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest;
13 15  
14 16  
15 17  
... ... @@ -14,21 +16,20 @@
14 16 import com.lyms.platform.operate.web.result.CjStatisticsListResult;
15 17 import com.lyms.platform.operate.web.result.CjStatisticsResult;
16 18 import com.lyms.platform.operate.web.result.HighScoreResult;
17   -import com.lyms.platform.operate.web.utils.CommonsHelper;
18   -import com.lyms.platform.operate.web.utils.FunvCommonUtil;
19   -import com.lyms.platform.operate.web.utils.UnitConstants;
20   -import com.lyms.platform.operate.web.utils.UnitUtils;
21 19 import com.lyms.platform.operate.web.worker.AntExRecordWorker;
22   -import com.lyms.platform.operate.web.worker.WorkHR;
23 20 import com.lyms.platform.permission.model.Organization;
24 21 import com.lyms.platform.permission.model.OrganizationQuery;
25 22 import com.lyms.platform.permission.model.Users;
26 23 import com.lyms.platform.permission.service.OrganizationService;
27 24 import com.lyms.platform.permission.service.UsersService;
28   -import com.lyms.platform.pojo.*;
29   -import com.lyms.platform.query.*;
  25 +import com.lyms.platform.pojo.AntExRecordModel;
  26 +import com.lyms.platform.pojo.BasicConfig;
  27 +import com.lyms.platform.pojo.DataPermissionsModel;
  28 +import com.lyms.platform.pojo.Patients;
  29 +import com.lyms.platform.query.AntExRecordQuery;
  30 +import com.lyms.platform.query.DataPermissionsModelQuery;
  31 +import com.lyms.platform.query.PatientsQuery;
30 32 import org.apache.commons.collections.CollectionUtils;
31   -import org.apache.commons.collections.MapUtils;
32 33 import org.apache.commons.lang.math.NumberUtils;
33 34 import org.springframework.beans.factory.annotation.Autowired;
34 35 import org.springframework.beans.factory.annotation.Qualifier;
35 36  
... ... @@ -89,12 +90,12 @@
89 90 antExRecordQuery.setNeed(isPage);
90 91 antExRecordQuery.setPage(antExManagerQueryRequest.getPage());
91 92 antExRecordQuery.setLimit(antExManagerQueryRequest.getLimit());
92   - antExRecordQuery.setName(antExManagerQueryRequest.getName());
93   - antExRecordQuery.setPhone(antExManagerQueryRequest.getPhone());
  93 + // antExRecordQuery.setName(antExManagerQueryRequest.getName());
  94 + // antExRecordQuery.setPhone(antExManagerQueryRequest.getPhone());
94 95 antExRecordQuery.setrFactor(antExManagerQueryRequest.getRiskFactorId());
95 96 antExRecordQuery.setLevelId(antExManagerQueryRequest.getLevel());
96 97 antExRecordQuery.setBarCode(antExManagerQueryRequest.getBarCode());
97   - antExRecordQuery.setCardNo(antExManagerQueryRequest.getCardNo());
  98 + // antExRecordQuery.setCardNo(antExManagerQueryRequest.getCardNo());
98 99 antExRecordQuery.setProvinceRegisterId(antExManagerQueryRequest.getProvinceRegisterId());
99 100 antExRecordQuery.setCityRegisterId(antExManagerQueryRequest.getCityRegisterId());
100 101 antExRecordQuery.setAreaRegisterId(antExManagerQueryRequest.getAreaRegisterId());
101 102  
... ... @@ -218,7 +219,22 @@
218 219 * @return
219 220 */
220 221 public BaseResponse findList(AntExManagerQueryRequest antExManagerQueryRequest, Integer userId, boolean isRegion, String isPage) {
  222 + PatientsQuery patientsQuery = new PatientsQuery();
  223 + List<Patients> patientses = null;
  224 + if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) {
  225 + patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo());
  226 + patientses = patientsService.queryPatient1(patientsQuery, "modified");
  227 + }
  228 +
221 229 AntExRecordQuery antExRecordQuery = complayRequest(userId, antExManagerQueryRequest, isRegion, isPage);
  230 + if (CollectionUtils.isNotEmpty(patientses)) {
  231 + List<String> parentIds = new LinkedList<>();
  232 + for(Patients pa:patientses){
  233 + parentIds.add(pa.getId());
  234 + }
  235 + antExRecordQuery.setParentIds(parentIds);
  236 + }
  237 +
222 238 String hospital = autoMatchFacade.getHospitalId(userId);
223 239 List<AntExManagerResult> data = new ArrayList<>();
224 240 List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery);
... ... @@ -289,7 +305,7 @@
289 305 if (end > antExRecordModelList.size()) {
290 306 end = antExRecordModelList.size();
291 307 }
292   - listFuture.add(commonThreadPool.submit(new AntExRecordWorker(antExRecordModelList.subList(i, end), isRegion, organizationService, usersService, recordService, commonService, hospital, basicConfigService,antExService)));
  308 + listFuture.add(commonThreadPool.submit(new AntExRecordWorker(antExRecordModelList.subList(i, end), isRegion, organizationService, usersService, recordService, commonService, hospital, basicConfigService, antExService)));
293 309 }
294 310 for (Future f : listFuture) {
295 311 try {
... ... @@ -374,8 +390,7 @@
374 390 // dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
375 391 // }
376 392 //2017-03-15 高帆说的改成这样
377   - if (patients.getLastMenses() != null && record.getCheckTime() != null)
378   - {
  393 + if (patients.getLastMenses() != null && record.getCheckTime() != null) {
379 394 int days = DateUtil.daysBetween(patients.getLastMenses(), record.getCheckTime());
380 395 String week = (days / 7) + "";
381 396 int day = (days % 7);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ ea213ea
... ... @@ -84,8 +84,8 @@
84 84  
85 85 String hospital = autoMatchFacade.getHospitalId(userId);
86 86 //表示区域的
87   - if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospital))&&type==2) {
88   - String parentId = antenatalExaminationFacade.handHideBuild(referralApplyOrderAddRequest.getPid(), referralApplyOrderAddRequest.getParentId(), userId,-1);
  87 + if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospital)) && type == 2) {
  88 + String parentId = antenatalExaminationFacade.handHideBuild(referralApplyOrderAddRequest.getPid(), referralApplyOrderAddRequest.getParentId(), userId, -1);
89 89 if (StringUtils.isEmpty(parentId)) {
90 90 //打印日志
91 91 }
... ... @@ -203,7 +203,7 @@
203 203 }
204 204 referralApplyOrderModel.setDays(DateUtil.getBabyMonthAge1(babyModel.getBirth(), new Date()));
205 205 referralApplyOrderModel.setDueWeek(new Date());
206   - if(StringUtils.isNotEmpty(babyModel.getParentId())){
  206 + if (StringUtils.isNotEmpty(babyModel.getParentId())) {
207 207 Patients patients = patientsService.findOnePatientById(babyModel.getParentId());
208 208 referralApplyOrderModel.setMname(patients.getUsername());
209 209 referralApplyOrderModel.setPhone(patients.getPhone());
210 210  
211 211  
... ... @@ -300,14 +300,14 @@
300 300  
301 301 //表示区域的
302 302 if (StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) {
303   - String parentId = antenatalExaminationFacade.handHideBuild(sieveApplyOrderAddRequest.getPid(), sieveApplyOrderAddRequest.getParentId(), userId,-1);
  303 + String parentId = antenatalExaminationFacade.handHideBuild(sieveApplyOrderAddRequest.getPid(), sieveApplyOrderAddRequest.getParentId(), userId, -1);
304 304 if (StringUtils.isEmpty(parentId)) {
305 305 throw new BusinessException();
306 306 //打印日志
307   - }else {
  307 + } else {
308 308 sieveApplyOrderModel.setParentId(parentId);
309 309 sieveApplyOrderAddRequest.setParentId(parentId);
310   - Patients p=patientsService.findOnePatientById(parentId);
  310 + Patients p = patientsService.findOnePatientById(parentId);
311 311  
312 312 //加入产筛
313 313 patientsService.validata(p);
... ... @@ -475,6 +475,7 @@
475 475 public BaseListResponse queryBabyApplyOrder(BabyApplyOrderQueryRequest applyOrderQueryRequest, Integer userId) {
476 476 ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
477 477 referralApplyOrderQuery.setType(1);
  478 + referralApplyOrderQuery.setQueryNo(applyOrderQueryRequest.getQueryNo());
478 479 List<BabyApplyOrderResult> babyApplyOrderResults = new ArrayList<>();
479 480 referralApplyOrderQuery.setName(applyOrderQueryRequest.getName());
480 481 referralApplyOrderQuery.setCardNo(applyOrderQueryRequest.getCardNo());
481 482  
... ... @@ -628,7 +629,21 @@
628 629 * @return
629 630 */
630 631 public BaseListResponse queryApplyOrder(ApplyOrderQueryRequest applyOrderQueryRequest, Integer userId) {
  632 + PatientsQuery patientsQuery = new PatientsQuery();
  633 + List<Patients> patientses = null;
  634 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(applyOrderQueryRequest.getQueryNo())) {
  635 + patientsQuery.setQueryNo(applyOrderQueryRequest.getQueryNo());
  636 + patientses = patientsService.queryPatient1(patientsQuery, "modified");
  637 + }
  638 +
631 639 ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
  640 + if (CollectionUtils.isNotEmpty(patientses)) {
  641 + List<String> parentIds = new LinkedList<>();
  642 + for (Patients pa : patientses) {
  643 + parentIds.add(pa.getId());
  644 + }
  645 + referralApplyOrderQuery.setParentIds(parentIds);
  646 + }
632 647 referralApplyOrderQuery.setName(applyOrderQueryRequest.getName());
633 648 Date currentDate = DateUtil.formatDate(new Date());
634 649 //根据年龄
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ ea213ea
... ... @@ -2070,7 +2070,7 @@
2070 2070 babyQuery.setCityId(StringUtils.isEmpty(request.getCityId())?null:request.getCityId());
2071 2071 // 区/县
2072 2072 babyQuery.setAreaId(StringUtils.isEmpty(request.getAreaId())?null:request.getAreaId());
2073   -
  2073 + babyQuery.setQueryNo(request.getQueryNo());
2074 2074 List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery, "modified", Sort.Direction.DESC);
2075 2075  
2076 2076 return models;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java View file @ ea213ea
1 1 package com.lyms.platform.operate.web.facade;
2 2  
3   -import com.lyms.platform.biz.service.BasicConfigService;
4   -import com.lyms.platform.biz.service.DataPermissionService;
5   -import com.lyms.platform.biz.service.FolicAcidService;
6   -import com.lyms.platform.biz.service.ResidentsArchiveService;
  3 +import com.lyms.platform.biz.service.*;
7 4 import com.lyms.platform.common.constants.ErrorCodeConstants;
8 5 import com.lyms.platform.common.enums.YnEnums;
9 6 import com.lyms.platform.common.result.BaseListResponse;
10 7 import com.lyms.platform.common.result.BaseObjectResponse;
11 8 import com.lyms.platform.common.result.BaseResponse;
12 9 import com.lyms.platform.common.utils.DateUtil;
13   -import com.lyms.platform.common.utils.DefenceUtils;
14 10 import com.lyms.platform.common.utils.ExcelUtil;
15 11 import com.lyms.platform.common.utils.SystemConfig;
16 12 import com.lyms.platform.operate.web.request.FolicAcidAddRequest;
... ... @@ -34,7 +30,6 @@
34 30 import org.springframework.data.domain.Sort;
35 31 import org.springframework.stereotype.Component;
36 32  
37   -import javax.jws.Oneway;
38 33 import javax.servlet.http.HttpServletResponse;
39 34 import java.io.OutputStream;
40 35 import java.util.*;
... ... @@ -59,6 +54,8 @@
59 54 private BasicConfigService basicConfigService;
60 55 @Autowired
61 56 private DataPermissionService dataPermissionService;
  57 + @Autowired
  58 + private PatientsService patientsService;
62 59  
63 60 public BaseResponse addOrUpdateFolicAcid(FolicAcidAddRequest addRequest,Integer userId){
64 61  
... ... @@ -410,6 +407,31 @@
410 407 folicAcidQuery.setHospitalId("-1");
411 408 }
412 409 }*/
  410 +
  411 +
  412 +
  413 + List<ResidentsArchiveModel> modelList = null;
  414 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(queryRequest.getQueryNo())) {
  415 + ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
  416 + archiveQuery.setQueryNo(queryRequest.getQueryNo());
  417 + modelList = residentsArchiveService.queryResident(archiveQuery);
  418 + }
  419 +
  420 + if (CollectionUtils.isNotEmpty(modelList)) {
  421 + List<String> parentIds = new LinkedList<>();
  422 + for(ResidentsArchiveModel pa:modelList){
  423 + parentIds.add(pa.getId());
  424 + }
  425 + folicAcidQuery.setParentIds(parentIds);
  426 + }else{//没有数据
  427 + BaseListResponse baseListResponse = new BaseListResponse();
  428 + baseListResponse.setErrormsg("成功");
  429 + baseListResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  430 + baseListResponse.setData(list);
  431 + baseListResponse.setPageInfo(folicAcidQuery.getPageInfo());
  432 + return baseListResponse;
  433 + }
  434 +
413 435 List<FolicAcid> folicAcidList = folicAcidService.queryFolicAcid(folicAcidQuery);
414 436 if (CollectionUtils.isNotEmpty(folicAcidList)){
415 437 for (FolicAcid data : folicAcidList){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ ea213ea
... ... @@ -11,7 +11,6 @@
11 11 import com.lyms.platform.common.result.BaseObjectResponse;
12 12 import com.lyms.platform.common.result.BaseResponse;
13 13 import com.lyms.platform.common.utils.DateUtil;
14   -import com.lyms.platform.common.utils.DefenceUtils;
15 14 import com.lyms.platform.common.utils.ExcelUtil;
16 15 import com.lyms.platform.common.utils.SystemConfig;
17 16 import com.lyms.platform.operate.web.request.PremaritalCheckupAddRequest;
... ... @@ -27,7 +26,6 @@
27 26 import com.lyms.platform.permission.service.OrganizationService;
28 27 import com.lyms.platform.permission.service.UsersService;
29 28 import com.lyms.platform.pojo.BasicConfig;
30   -import com.lyms.platform.pojo.DoctorModel;
31 29 import com.lyms.platform.pojo.PremaritalCheckup;
32 30 import com.lyms.platform.pojo.ResidentsArchiveModel;
33 31 import com.lyms.platform.query.PremaritalCheckupQuery;
... ... @@ -36,7 +34,6 @@
36 34 import org.apache.commons.lang.StringUtils;
37 35 import org.springframework.beans.factory.annotation.Autowired;
38 36 import org.springframework.stereotype.Component;
39   -import sun.applet.Main;
40 37  
41 38 import javax.servlet.http.HttpServletResponse;
42 39 import java.io.OutputStream;
43 40  
... ... @@ -378,8 +375,9 @@
378 375 List<String> parentIds = null;
379 376  
380 377 //用姓名和联系方式查询到的居民建档ID
381   - if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo())) {
  378 + if (StringUtils.isNotEmpty(request.getUsername()) || StringUtils.isNotEmpty(request.getPhone()) || StringUtils.isNotEmpty(request.getCardNo())||StringUtils.isNotEmpty(request.getQueryNo())) {
382 379 ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
  380 + archiveQuery.setQueryNo(request.getQueryNo());
383 381 archiveQuery.setYn(YnEnums.YES.getId());
384 382 archiveQuery.setUsername(request.getUsername());
385 383 archiveQuery.setCertificateNum(request.getCardNo());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ ea213ea
... ... @@ -5,8 +5,6 @@
5 5 import com.lyms.platform.biz.service.PatientsService;
6 6 import com.lyms.platform.biz.service.SieveService;
7 7 import com.lyms.platform.common.constants.ErrorCodeConstants;
8   -import com.lyms.platform.common.enums.ServiceStatusEnums;
9   -import com.lyms.platform.common.enums.SexEnum;
10 8 import com.lyms.platform.common.enums.YnEnums;
11 9 import com.lyms.platform.common.result.BaseListResponse;
12 10 import com.lyms.platform.common.result.BaseObjectResponse;
13 11  
14 12  
... ... @@ -22,17 +20,19 @@
22 20 import com.lyms.platform.operate.web.result.SieveListResult;
23 21 import com.lyms.platform.operate.web.result.SieveResult;
24 22 import com.lyms.platform.operate.web.worker.SieveWorker;
25   -import com.lyms.platform.operate.web.worker.WorkHR;
26 23 import com.lyms.platform.permission.model.Organization;
27 24 import com.lyms.platform.permission.service.OrganizationService;
28   -import com.lyms.platform.pojo.*;
29   -import com.lyms.platform.query.*;
  25 +import com.lyms.platform.pojo.SieveApplyOrderModel;
  26 +import com.lyms.platform.pojo.SieveModel;
  27 +import com.lyms.platform.pojo.SieveResultModel;
  28 +import com.lyms.platform.query.SieveApplyOrderQuery;
  29 +import com.lyms.platform.query.SieveQuery;
  30 +import com.lyms.platform.query.SieveResultQuery;
30 31 import org.apache.commons.collections.CollectionUtils;
31 32 import org.apache.commons.lang.StringUtils;
32 33 import org.apache.commons.lang.math.NumberUtils;
33 34 import org.springframework.beans.factory.annotation.Autowired;
34 35 import org.springframework.beans.factory.annotation.Qualifier;
35   -import org.springframework.data.domain.Sort;
36 36 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
37 37 import org.springframework.stereotype.Component;
38 38  
39 39  
... ... @@ -193,7 +193,9 @@
193 193 * @return
194 194 */
195 195 public BaseResponse queryList(CqSieveQueryRequest cqSieveQueryRequest, Integer userId, String needPage) {
  196 +
196 197 SieveQuery sieveQuery = new SieveQuery();
  198 + sieveQuery.setQueryNo(cqSieveQueryRequest.getQueryNo());
197 199 sieveQuery.setYn(YnEnums.YES.getId());
198 200 sieveQuery.setPhone(cqSieveQueryRequest.getPhone());
199 201 sieveQuery.setStatus(cqSieveQueryRequest.getStatus());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java View file @ ea213ea
... ... @@ -2,12 +2,9 @@
2 2  
3 3 import com.lyms.platform.common.core.annotation.form.Form;
4 4 import com.lyms.platform.common.core.annotation.form.FormParam;
5   -import com.lyms.platform.common.utils.DateUtil;
6 5 import com.lyms.platform.common.utils.StringUtils;
7 6 import org.apache.commons.lang.math.NumberUtils;
8 7  
9   -import java.util.Date;
10   -
11 8 /**
12 9 *
13 10 * 产检管理查询
14 11  
15 12  
... ... @@ -71,8 +68,16 @@
71 68 // 医院id
72 69 @FormParam("hospitalId")
73 70 private String hId;
  71 + //查询号
  72 + private String queryNo;
74 73  
  74 + public String getQueryNo() {
  75 + return queryNo;
  76 + }
75 77  
  78 + public void setQueryNo(String queryNo) {
  79 + this.queryNo = queryNo;
  80 + }
76 81  
77 82 public Integer capStart() {
78 83 if (StringUtils.isNotEmpty(startDueWeek) ) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java View file @ ea213ea
... ... @@ -51,6 +51,17 @@
51 51 */
52 52 private Integer type;
53 53  
  54 + //查询号
  55 + private String queryNo;
  56 +
  57 + public String getQueryNo() {
  58 + return queryNo;
  59 + }
  60 +
  61 + public void setQueryNo(String queryNo) {
  62 + this.queryNo = queryNo;
  63 + }
  64 +
54 65  
55 66 public Integer getEndAge() {
56 67 return endAge;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyApplyOrderQueryRequest.java View file @ ea213ea
... ... @@ -37,6 +37,16 @@
37 37 // //1 转入 0转出
38 38 private String action;
39 39  
  40 + //查询号
  41 + private String queryNo;
  42 +
  43 + public String getQueryNo() {
  44 + return queryNo;
  45 + }
  46 +
  47 + public void setQueryNo(String queryNo) {
  48 + this.queryNo = queryNo;
  49 + }
40 50 public String getAction() {
41 51 return action;
42 52 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java View file @ ea213ea
... ... @@ -79,6 +79,16 @@
79 79  
80 80 //评价
81 81 private String evaluate;
  82 + //查询号
  83 + private String queryNo;
  84 +
  85 + public String getQueryNo() {
  86 + return queryNo;
  87 + }
  88 +
  89 + public void setQueryNo(String queryNo) {
  90 + this.queryNo = queryNo;
  91 + }
82 92  
83 93 public String getItemType() {
84 94 return itemType;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CqSieveQueryRequest.java View file @ ea213ea
... ... @@ -47,6 +47,17 @@
47 47 @FormParam
48 48 private Integer cDueWeekEnd;
49 49  
  50 + //查询号
  51 + private String queryNo;
  52 +
  53 + public String getQueryNo() {
  54 + return queryNo;
  55 + }
  56 +
  57 + public void setQueryNo(String queryNo) {
  58 + this.queryNo = queryNo;
  59 + }
  60 +
50 61 public Integer getcDueWeekStart() {
51 62 return cDueWeekStart;
52 63 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/FolicAcidQueryRequest.java View file @ ea213ea
... ... @@ -2,8 +2,6 @@
2 2  
3 3 import com.lyms.platform.common.core.annotation.form.Form;
4 4  
5   -import java.util.Date;
6   -
7 5 /**
8 6 * Created by Administrator on 2016/12/5 0005.
9 7 */
... ... @@ -30,6 +28,16 @@
30 28 private String drawTime;
31 29 //高危因素
32 30 private String highRisk;
  31 + //查询号
  32 + private String queryNo;
  33 +
  34 + public String getQueryNo() {
  35 + return queryNo;
  36 + }
  37 +
  38 + public void setQueryNo(String queryNo) {
  39 + this.queryNo = queryNo;
  40 + }
33 41  
34 42 public String getId() {
35 43 return id;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java View file @ ea213ea
... ... @@ -2,8 +2,6 @@
2 2  
3 3 import com.lyms.platform.common.core.annotation.form.Form;
4 4  
5   -import java.util.Date;
6   -
7 5 /**
8 6 * 婚前检查查询条件
9 7 *
... ... @@ -30,6 +28,16 @@
30 28 //性别类型
31 29 private Integer sexType;
32 30  
  31 + //查询号
  32 + private String queryNo;
  33 +
  34 + public String getQueryNo() {
  35 + return queryNo;
  36 + }
  37 +
  38 + public void setQueryNo(String queryNo) {
  39 + this.queryNo = queryNo;
  40 + }
33 41 public Integer getSexType() {
34 42 return sexType;
35 43 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighriskChangeHospitalListResult.java View file @ ea213ea
... ... @@ -15,6 +15,8 @@
15 15 private String monthAge;
16 16 //出生日期
17 17 private String birthday;
  18 + //筛查时间
  19 + private String screenTime;
18 20 //性别
19 21 private String sex;
20 22 //筛查类型 1=初筛 2=复筛
... ... @@ -25,6 +27,8 @@
25 27 private String hospitalName;
26 28 //医生名称
27 29 private String doctorName;
  30 + //转诊时间
  31 + private String createTime;
28 32 //母亲联系方式
29 33 private String mommnyPhone;
30 34 //母亲加密联系方式
... ... @@ -33,6 +37,22 @@
33 37 private String receiveTime;
34 38 //状态 0-未接受 1-已接受
35 39 private String status;
  40 +
  41 + public String getScreenTime() {
  42 + return screenTime;
  43 + }
  44 +
  45 + public void setScreenTime(String screenTime) {
  46 + this.screenTime = screenTime;
  47 + }
  48 +
  49 + public String getCreateTime() {
  50 + return createTime;
  51 + }
  52 +
  53 + public void setCreateTime(String createTime) {
  54 + this.createTime = createTime;
  55 + }
36 56  
37 57 public String getId() {
38 58 return id;