jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f42d27e505c5eb0cb7d6d5e8caef4510bcd4f3fd

Authored by jishenfei
1 parent dae8725267
Exists in master and in 4 other branches dev, fengning, fengning2023-06-06, luanping

丰宁需求2.0

Showing 18 changed files with 207 additions and 9 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/AntExRecordModel.java View file @ f42d27e
... ... @@ -99,12 +99,14 @@
99 99 private String cityRegisterId;
100 100 private String areaRegisterId;
101 101 private String streetRegisterId;
  102 + private String villageRegisterId;
102 103 //居住地
103 104 private String address;
104 105 private String provinceId;
105 106 private String cityId;
106 107 private String areaId;
107 108 private String streetId;
  109 + private String hvillage;
108 110  
109 111 // 0～12 孕周 16～20 孕周 21～24 孕周 28～36 孕周 37～ 分娩
110 112 // 1 表示在上面各个孕周范围内的第一次检查，2或者空表示 不是
... ... @@ -135,6 +137,22 @@
135 137 private String teamIdOld;//旧医生团队
136 138 private String teamIdNew;//新医生团队
137 139 private String reason;//换团队的原因
  140 +
  141 + public String getVillageRegisterId() {
  142 + return villageRegisterId;
  143 + }
  144 +
  145 + public void setVillageRegisterId(String villageRegisterId) {
  146 + this.villageRegisterId = villageRegisterId;
  147 + }
  148 +
  149 + public String getHvillage() {
  150 + return hvillage;
  151 + }
  152 +
  153 + public void setHvillage(String hvillage) {
  154 + this.hvillage = hvillage;
  155 + }
138 156  
139 157 public String getTeamIdOld() {
140 158 return teamIdOld;
platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java View file @ f42d27e
... ... @@ -202,6 +202,7 @@
202 202 private String cityId;
203 203 private String areaId;
204 204 private String streetId;
  205 + private String villageId;
205 206 // 父亲信息
206 207 private String fname;
207 208 private String fjob;
... ... @@ -1441,6 +1442,10 @@
1441 1442 */
1442 1443 private String babyStreetId;
1443 1444 /**
  1445 + *村级单位
  1446 + */
  1447 + private String babyVillageId;
  1448 + /**
1444 1449 *详细地址
1445 1450 */
1446 1451 private String babyAddress;
... ... @@ -1461,6 +1466,22 @@
1461 1466  
1462 1467 //儿童眼保健最后检查时间
1463 1468 private Date babyCheckEyeLastDate;
  1469 +
  1470 + public String getVillageId() {
  1471 + return villageId;
  1472 + }
  1473 +
  1474 + public void setVillageId(String villageId) {
  1475 + this.villageId = villageId;
  1476 + }
  1477 +
  1478 + public String getBabyVillageId() {
  1479 + return babyVillageId;
  1480 + }
  1481 +
  1482 + public void setBabyVillageId(String babyVillageId) {
  1483 + this.babyVillageId = babyVillageId;
  1484 + }
1464 1485  
1465 1486 public Date getBabyCheckEyeLastDate() {
1466 1487 return babyCheckEyeLastDate;
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ f42d27e
... ... @@ -141,7 +141,7 @@
141 141 private String hareaId;
142 142 private String hstreetId;
143 143 //村
144   - private String hvillage;
  144 + private String hvillage;
145 145 private String haddress;
146 146  
147 147 /******add by lqy end *********/
platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java View file @ f42d27e
... ... @@ -65,6 +65,7 @@
65 65 private String cityRegisterId;
66 66 private String areaRegisterId;
67 67 private String streetRegisterId;
  68 + private String villageRegisterId;
68 69  
69 70 //居住地
70 71 private String provinceId;
... ... @@ -73,6 +74,7 @@
73 74 private String streetId;
74 75 private Integer type;
75 76 private String neqId;
  77 + private String hvillage;
76 78  
77 79  
78 80 private Date modifiedStart;
... ... @@ -89,6 +91,22 @@
89 91 private String teamId;
90 92  
91 93 private List<String> streetIds;
  94 +
  95 + public String getVillageRegisterId() {
  96 + return villageRegisterId;
  97 + }
  98 +
  99 + public void setVillageRegisterId(String villageRegisterId) {
  100 + this.villageRegisterId = villageRegisterId;
  101 + }
  102 +
  103 + public String getHvillage() {
  104 + return hvillage;
  105 + }
  106 +
  107 + public void setHvillage(String hvillage) {
  108 + this.hvillage = hvillage;
  109 + }
92 110  
93 111 public List<String> getStreetIds() {
94 112 return streetIds;
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ f42d27e
... ... @@ -341,6 +341,8 @@
341 341  
342 342 private String cityId;
343 343 private String streetId;
  344 + //村级单位
  345 + private String villageId;
344 346 private List<String> streetIds;
345 347  
346 348 //详细地址
... ... @@ -404,6 +406,8 @@
404 406 *乡镇街道
405 407 */
406 408 private String babyStreetId;
  409 + //村级单位
  410 + private String babyVillageId;
407 411 private List<String> babyStreetIds;
408 412 /**
409 413 *详细地址
... ... @@ -419,6 +423,22 @@
419 423 private Date babyCheckEyeLastDateStart;
420 424 private Date babyCheckEyeLastDateEnd;
421 425  
  426 + public String getVillageId() {
  427 + return villageId;
  428 + }
  429 +
  430 + public void setVillageId(String villageId) {
  431 + this.villageId = villageId;
  432 + }
  433 +
  434 + public String getBabyVillageId() {
  435 + return babyVillageId;
  436 + }
  437 +
  438 + public void setBabyVillageId(String babyVillageId) {
  439 + this.babyVillageId = babyVillageId;
  440 + }
  441 +
422 442 public Date getBabyCheckEyeLastDateStart() {
423 443 return babyCheckEyeLastDateStart;
424 444 }
... ... @@ -1956,6 +1976,8 @@
1956 1976 }
1957 1977 if (StringUtils.isNotEmpty(streetId)) {
1958 1978 condition = condition.and("streetId", streetId, MongoOper.IS);
  1979 + }if (StringUtils.isNotEmpty(villageId)) {
  1980 + condition = condition.and("villageId", villageId, MongoOper.IS);
1959 1981 }
1960 1982 if (CollectionUtils.isNotEmpty(streetIds)) {
1961 1983 condition = condition.and("streetId", streetIds, MongoOper.IN);
... ... @@ -2254,6 +2276,8 @@
2254 2276 }
2255 2277 if (StringUtils.isNotEmpty(babyStreetId)) {
2256 2278 condition = condition.and("babyStreetId", babyStreetId, MongoOper.IS);
  2279 + }if (StringUtils.isNotEmpty(babyVillageId)) {
  2280 + condition = condition.and("babyVillageId", babyVillageId, MongoOper.IS);
2257 2281 }
2258 2282 if (CollectionUtils.isNotEmpty(babyStreetIds)) {
2259 2283 condition = condition.and("babyStreetId", babyStreetIds, MongoOper.IN);
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ f42d27e
... ... @@ -126,7 +126,10 @@
126 126 private String streetId;
127 127 private String villageId;
128 128  
  129 + //随访医生
  130 + private String booksuifangDoctor;
129 131  
  132 +
130 133 //医院id
131 134 private List<String> hospitalList;
132 135  
... ... @@ -420,6 +423,14 @@
420 423  
421 424 private String currentAreaId;
422 425 private Integer isComplete;
  426 +
  427 + public String getBooksuifangDoctor() {
  428 + return booksuifangDoctor;
  429 + }
  430 +
  431 + public void setBooksuifangDoctor(String booksuifangDoctor) {
  432 + this.booksuifangDoctor = booksuifangDoctor;
  433 + }
423 434  
424 435 public String getVillageRegister() {
425 436 return villageRegister;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java View file @ f42d27e
... ... @@ -275,6 +275,7 @@
275 275 @RequestParam(value = "weakSonInfo", required = false) String weakSonInfo,
276 276 @RequestParam(value = "highRiskInfo", required = false) String highRiskInfo,
277 277 @RequestParam(value = "streetId", required = false) String streetId,
  278 + @RequestParam(value = "villageId", required = false) String villageId,
278 279 @RequestParam(value = "hospitalProvinceId", required = false) String hospitalProvinceId,
279 280 @RequestParam(value = "hospitalCityId", required = false) String hospitalCityId,
280 281 @RequestParam(value = "hospitalAreaId", required = false) String hospitalAreaId,
... ... @@ -284,7 +285,7 @@
284 285 @RequestParam(value = "isArea", required = false) String isArea,
285 286 @RequestParam(value = "fmHospitalId", required = false) String fmHospitalId,
286 287 @RequestParam(value = "openDisease", required = false) String openDisease,
287   - @RequestParam(value = "endCase", required = false) Integer endCase,
  288 + @RequestParam(value = "endcase", required = false) Integer endCase,
288 289 @RequestParam(value = "dueWeekStart", required = false) Integer dueWeekStart,
289 290 @RequestParam(value = "dueWeekEnd", required = false) Integer dueWeekEnd,
290 291 @RequestParam(value = "lastCheckDoctor", required = false) String lastCheckDoctor,
... ... @@ -303,6 +304,7 @@
303 304 @RequestParam(value = "babyCityId", required = false) String babyCityId,
304 305 @RequestParam(value = "babyAreaId", required = false) String babyAreaId,
305 306 @RequestParam(value = "babyStreetId", required = false) String babyStreetId,
  307 + @RequestParam(value = "babyvillageId", required = false) String babyvillageId,
306 308 @RequestParam(value = "areaType", required = false) Integer areaType
307 309 ) {
308 310  
... ... @@ -326,6 +328,9 @@
326 328 request.setBcardNo(bcardNo);
327 329 request.setMcardNo(mcardNo);
328 330 request.setMphone(mphone);
  331 + //村级单位条件
  332 + request.setVillageId(villageId);
  333 + request.setBabyvillageId(babyvillageId);
329 334 if(startMonthAge!=null) {//不改变之前逻辑
330 335 //儿童管理页面月龄条件查询36：3岁 37:4岁 38：5岁 39：6岁 40：>6岁
331 336 switch (startMonthAge) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java View file @ f42d27e
... ... @@ -262,12 +262,19 @@
262 262 */
263 263 @TokenRequired
264 264 @ResponseBody
265   - @RequestMapping(value = "childbirthYJAManager", method = RequestMethod.POST)
  265 + @RequestMapping(value = "childbirthYJAManager", method = RequestMethod.GET)
266 266 //@RequestBody
267   - public BaseListResponse childbirthYJAManager(HttpServletRequest httpServletRequest, @RequestBody ChildbirthManagerRequest childbirthManagerRequest) {
  267 + public BaseListResponse childbirthYJAManager(HttpServletRequest httpServletRequest,
  268 + @Valid ChildbirthManagerRequest childbirthManagerRequest) {
268 269  
269 270 BaseListResponse baseListResponse;
270   - childbirthManagerRequest.setStatus(5);
  271 + if (childbirthManagerRequest==null){
  272 + childbirthManagerRequest = new ChildbirthManagerRequest();
  273 + childbirthManagerRequest.setStatus(5);
  274 + }else{
  275 + childbirthManagerRequest.setStatus(5);
  276 + }
  277 +
271 278 childbirthManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
272 279 String hospitalId = autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId());
273 280 try {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ f42d27e
... ... @@ -173,11 +173,13 @@
173 173 antExRecordQuery.setCityRegisterId(antExManagerQueryRequest.getCityRegisterId());
174 174 antExRecordQuery.setAreaRegisterId(antExManagerQueryRequest.getAreaRegisterId());
175 175 antExRecordQuery.setStreetRegisterId(antExManagerQueryRequest.getStreetRegisterId());
  176 + antExRecordQuery.setVillageRegisterId(antExManagerQueryRequest.getVillageRegisterId());
176 177  
177 178 antExRecordQuery.setProvinceId(antExManagerQueryRequest.getProvinceId());
178 179 antExRecordQuery.setCityId(antExManagerQueryRequest.getCityId());
179 180 antExRecordQuery.setAreaId(antExManagerQueryRequest.getAreaId());
180 181 antExRecordQuery.setStreetId(antExManagerQueryRequest.getStreetId());
  182 + antExRecordQuery.setHvillage(antExManagerQueryRequest.getHvillage());
181 183 if (antExManagerQueryRequest.getFirst() != null && antExManagerQueryRequest.getFirst() == 2) {
182 184 antExRecordQuery.setFirst(antExManagerQueryRequest.getFirst());
183 185 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ f42d27e
... ... @@ -2971,13 +2971,12 @@
2971 2971 if (StringUtils.isNotEmpty(request.getRiskCode()) && StringUtils.isNum(request.getRiskCode().replace("-", ""))) {
2972 2972 babyQuery.setRiskCode(Long.valueOf(request.getRiskCode().replace("-", "")));
2973 2973 }
2974   -
2975   -
2976 2974 //儿童户籍查询(省市县区)
2977 2975 babyQuery.setBabyProvinceId(request.getBabyProvinceId());
2978 2976 babyQuery.setBabyCityId(request.getBabyCityId());
2979 2977 babyQuery.setBabyAreaId(request.getBabyAreaId());
2980 2978 babyQuery.setBabyStreetId(request.getBabyStreetId());
  2979 + babyQuery.setBabyVillageId(request.getBabyvillageId());
2981 2980 //结案查询
2982 2981 babyQuery.setEndCase(request.getEndCase());
2983 2982 //体弱儿详情
... ... @@ -3052,7 +3051,7 @@
3052 3051  
3053 3052 babyQuery.setHospitalIdList(hospitalIdList);
3054 3053 List <BabyModel> models = getBabayListByCondition(request, true, babyQuery);
3055   - if (CollectionUtils.isNotEmpty(models)) {
  3054 + if (CollectionUtils.isNotEmpty(models)) {
3056 3055 int batchSize = 5;
3057 3056 int end = 0;
3058 3057 List <Future> futures = new ArrayList <>();
... ... @@ -3672,6 +3671,7 @@
3672 3671 babyQuery.setAreaId(StringUtils.isEmpty(request.getAreaId()) ? null : request.getAreaId());
3673 3672  
3674 3673 babyQuery.setStreetId(StringUtils.isEmpty(request.getStreetId()) ? null : request.getStreetId());
  3674 + babyQuery.setVillageId(StringUtils.isEmpty(request.getVillageId()) ? null : request.getVillageId());
3675 3675 babyQuery.setQueryNo(request.getQueryNo());
3676 3676 //滦平、隆化-儿保管理-全部 加健康/高危筛选
3677 3677 babyQuery.setHealthHigh(null!=request.getHealthHigh()?request.getHealthHigh():null);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ f42d27e
... ... @@ -2667,12 +2667,14 @@
2667 2667 patientsQuery.setCityId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterCityId()) ? null : childbirthManagerRequest.getRegisterCityId());
2668 2668 patientsQuery.setAreaId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterAreaId()) ? null : childbirthManagerRequest.getRegisterAreaId());
2669 2669 patientsQuery.setStreetId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterStreetId()) ? null : childbirthManagerRequest.getRegisterStreetId());
  2670 + patientsQuery.setVillageId(StringUtils.isEmpty(childbirthManagerRequest.getHvillage()) ? null : childbirthManagerRequest.getHvillage());
2670 2671  
2671 2672 patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getLivingProvinceId()) ? null : childbirthManagerRequest.getLivingProvinceId());
2672 2673 patientsQuery.setCityRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getLivingCityId()) ? null : childbirthManagerRequest.getLivingCityId());
2673 2674 patientsQuery.setAreaRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getLivingAreaId()) ? null : childbirthManagerRequest.getLivingAreaId());
2674 2675  
2675 2676 patientsQuery.setStreetRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getLivingStreetId()) ? null : childbirthManagerRequest.getLivingStreetId());
  2677 + patientsQuery.setVillageRegister(StringUtils.isEmpty(childbirthManagerRequest.getVillageRegisterId()) ? null : childbirthManagerRequest.getVillageRegisterId());
2676 2678  
2677 2679 patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone());
2678 2680 patientsQuery.setQueryNo(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo()) ? null : childbirthManagerRequest.getQueryNo());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ f42d27e
... ... @@ -2644,6 +2644,7 @@
2644 2644 PatientsQuery patientsQuery = new PatientsQuery();
2645 2645 patientsQuery.setCurrentAreaId(organization.getAreaId());
2646 2646 patientsQuery.setWqxType(patientManagerRequest.getWqxType());
  2647 + patientsQuery.setBooksuifangDoctor(patientManagerRequest.getBooksuifangDoctor());
2647 2648  
2648 2649 //孕产建档管理-初诊医生 是否 条件查询
2649 2650 if(StringUtils.isNotEmpty(patientManagerRequest.getProdDoctor())){
... ... @@ -2813,7 +2814,7 @@
2813 2814 // patientManagerQueryModel.setCheckTime(DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime()));
2814 2815 // }
2815 2816 // }
2816   -
  2817 + patientManagerQueryModel.setBooksuifangDoctor(patients.getBooksuifangDoctor());
2817 2818 patientManagerQueryModel.setBookbuildingDoctor(bookbuildingDoctor);
2818 2819 patientManagerQueryModel.setBookbuildingDate(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));
2819 2820 patientManagerQueryModel.setAddressRegister(CommonsHelper.getResidence(patients.getProvinceId(), patients.getCityId(), patients.getAreaId(), patients.getStreetId(), patients.getAddress(), basicConfigService));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java View file @ f42d27e
... ... @@ -80,6 +80,8 @@
80 80 private String areaRegisterId;
81 81 @FormParam("registerStreetId")
82 82 private String streetRegisterId;
  83 + @FormParam("villageRegisterId")
  84 + private String villageRegisterId;
83 85  
84 86 //居住地
85 87 @FormParam("livingProvinceId")
... ... @@ -90,6 +92,8 @@
90 92 private String areaId;
91 93 @FormParam("livingStreetId")
92 94 private String streetId;
  95 + @FormParam("hvillage")
  96 + private String hvillage;
93 97  
94 98 //产检医院
95 99 @FormParam("hospitalProvinceId")
... ... @@ -132,6 +136,22 @@
132 136 private String sieveType;
133 137  
134 138 private String teamId;
  139 +
  140 + public String getVillageRegisterId() {
  141 + return villageRegisterId;
  142 + }
  143 +
  144 + public void setVillageRegisterId(String villageRegisterId) {
  145 + this.villageRegisterId = villageRegisterId;
  146 + }
  147 +
  148 + public String getHvillage() {
  149 + return hvillage;
  150 + }
  151 +
  152 + public void setHvillage(String hvillage) {
  153 + this.hvillage = hvillage;
  154 + }
135 155  
136 156 public String getTeamId() {
137 157 return teamId;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java View file @ f42d27e
... ... @@ -73,6 +73,8 @@
73 73 private String bTime;
74 74 private String streetId;
75 75  
  76 + private String villageId;
  77 +
76 78 //建档时间
77 79 private String buildDate;
78 80  
79 81  
... ... @@ -171,12 +173,30 @@
171 173 *乡镇街道
172 174 */
173 175 private String babyStreetId;
  176 + //村级单位
  177 + private String babyvillageId;
174 178 /**
175 179 *详细地址
176 180 */
177 181 private String babyAddress;
178 182  
179 183 private Integer areaType;
  184 +
  185 + public String getVillageId() {
  186 + return villageId;
  187 + }
  188 +
  189 + public void setVillageId(String villageId) {
  190 + this.villageId = villageId;
  191 + }
  192 +
  193 + public String getBabyvillageId() {
  194 + return babyvillageId;
  195 + }
  196 +
  197 + public void setBabyvillageId(String babyvillageId) {
  198 + this.babyvillageId = babyvillageId;
  199 + }
180 200  
181 201 public Integer getAreaType() {
182 202 return areaType;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java View file @ f42d27e
... ... @@ -66,6 +66,9 @@
66 66 */
67 67 private String registerAreaId;
68 68  
  69 + //户籍村
  70 + private String villageRegisterId;
  71 +
69 72 private String registerStreetId;
70 73  
71 74 /**
... ... @@ -89,6 +92,8 @@
89 92 */
90 93 private String livingAreaId;
91 94  
  95 + //居住村
  96 + private String hvillage;
92 97  
93 98 private String livingStreetId;
94 99  
... ... @@ -203,6 +208,22 @@
203 208 private String yyzyfmHospitalId;
204 209 //建档医院id
205 210 private String firstHospitalId;
  211 +
  212 + public String getVillageRegisterId() {
  213 + return villageRegisterId;
  214 + }
  215 +
  216 + public void setVillageRegisterId(String villageRegisterId) {
  217 + this.villageRegisterId = villageRegisterId;
  218 + }
  219 +
  220 + public String getHvillage() {
  221 + return hvillage;
  222 + }
  223 +
  224 + public void setHvillage(String hvillage) {
  225 + this.hvillage = hvillage;
  226 + }
206 227  
207 228 public String getStartBuildWeek() {
208 229 return startBuildWeek;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java View file @ f42d27e
... ... @@ -153,6 +153,15 @@
153 153 //1 本县嫁外县 2 外县嫁本县
154 154 private Integer wqxType;
155 155  
  156 + private String booksuifangDoctor;
  157 +
  158 + public String getBooksuifangDoctor() {
  159 + return booksuifangDoctor;
  160 + }
  161 +
  162 + public void setBooksuifangDoctor(String booksuifangDoctor) {
  163 + this.booksuifangDoctor = booksuifangDoctor;
  164 + }
156 165  
157 166 public Integer getWqxType() {
158 167 return wqxType;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java View file @ f42d27e
... ... @@ -111,6 +111,16 @@
111 111  
112 112 private String typeStr;
113 113  
  114 + //随访医生
  115 + private String booksuifangDoctor;
  116 +
  117 + public String getBooksuifangDoctor() {
  118 + return booksuifangDoctor;
  119 + }
  120 +
  121 + public void setBooksuifangDoctor(String booksuifangDoctor) {
  122 + this.booksuifangDoctor = booksuifangDoctor;
  123 + }
114 124  
115 125 public String getTypeStr() {
116 126 return typeStr;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/QuanPatientWorker.java View file @ f42d27e
... ... @@ -24,6 +24,7 @@
24 24 import com.lyms.platform.pojo.Patients;
25 25 import com.lyms.platform.query.AntExChuQuery;
26 26 import com.lyms.platform.query.AntExQuery;
  27 +import com.lyms.platform.query.BasicConfigQuery;
27 28 import com.lyms.platform.query.PatientsQuery;
28 29 import org.apache.commons.collections.CollectionUtils;
29 30 import org.apache.commons.lang.StringUtils;
... ... @@ -228,6 +229,14 @@
228 229 PatientsQuery patientsQuery = new PatientsQuery();
229 230 patientsQuery.setSource(patients.getId());
230 231 patientsQuery.setBuildType(1);
  232 + if (patients.getPliveTypeId()!=null){
  233 + BasicConfigQuery basicConfigQuery = new BasicConfigQuery();
  234 + basicConfigQuery.setId(patients.getPliveTypeId());
  235 +
  236 + //所有数据
  237 + List<BasicConfig> basicConfigList = basicConfigService.queryBasicConfig(basicConfigQuery);
  238 + patientsQuery.setLiveType(basicConfigList.get(0).getName());
  239 + }
231 240 List <Patients> patients1 = patientsService.queryPatient(patientsQuery);
232 241 if (CollectionUtils.isNotEmpty(patients1)) {
233 242 for (Patients ps : patients1) {