jiangjiazhi / regional-platform

Download as
Browse Code »

Commit e61c0821321b66d25d7c91f2d78223b738445ce2

Authored by jiangjiazhi
2 parents cd19afcdc0 061637627b
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 9 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ e61c082
... ... @@ -651,8 +651,11 @@
651 651 // String st = md.format(new Date());
652 652 // System.out.print(st);
653 653  
654   - String s = getBabyMonthAge(parseYMD("2014-07-9"), new Date());
655   - System.out.println(s);
  654 +// String s = getBabyMonthAge(parseYMD("2014-07-9"), new Date());
  655 +// System.out.println(s);
  656 +
  657 + Date s = addDay(parseYMD("2016-02-26"), 168);
  658 + System.out.println(getyyyy_MM_dd(s));
656 659 } catch (Exception e)
657 660 {
658 661  
platform-dal/src/main/java/com/lyms/platform/pojo/StopPregModel.java View file @ e61c082
... ... @@ -13,7 +13,7 @@
13 13 public class StopPregModel extends BaseModel {
14 14 private String id;
15 15 //孕妇建档id
16   - private String pid;
  16 + private String patientId;
17 17  
18 18 //终止原因
19 19 private String stopReason;
20 20  
... ... @@ -75,12 +75,12 @@
75 75 this.id = id;
76 76 }
77 77  
78   - public String getPid() {
79   - return pid;
  78 + public String getPatientId() {
  79 + return patientId;
80 80 }
81 81  
82   - public void setPid(String pid) {
83   - this.pid = pid;
  82 + public void setPatientId(String patientId) {
  83 + this.patientId = patientId;
84 84 }
85 85  
86 86 public String getStopReason() {
platform-dal/src/main/java/com/lyms/platform/query/StopPregQuery.java View file @ e61c082
... ... @@ -18,7 +18,7 @@
18 18 public class StopPregQuery extends BaseQuery implements IConvertToNativeQuery {
19 19 private String id;
20 20 //孕妇建档id
21   - private String pid;
  21 + private String patientId;
22 22  
23 23 //终止原因
24 24 private List stopReason;
... ... @@ -38,8 +38,8 @@
38 38 public MongoQuery convertToQuery() {
39 39 MongoCondition condition = MongoCondition.newInstance();
40 40  
41   - if (null != pid) {
42   - condition = condition.and("pid", pid, MongoOper.IS);
  41 + if (null != patientId) {
  42 + condition = condition.and("patientId", patientId, MongoOper.IS);
43 43 }
44 44 if (null != id) {
45 45 condition = condition.and("id", new ObjectId(id), MongoOper.IS);
46 46  
... ... @@ -67,12 +67,12 @@
67 67 this.id = id;
68 68 }
69 69  
70   - public String getPid() {
71   - return pid;
  70 + public String getPatientId() {
  71 + return patientId;
72 72 }
73 73  
74   - public void setPid(String pid) {
75   - this.pid = pid;
  74 + public void setPatientId(String patientId) {
  75 + this.patientId = patientId;
76 76 }
77 77  
78 78 public List getStopReason() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java View file @ e61c082
... ... @@ -32,12 +32,15 @@
32 32 */
33 33 @RequestMapping(method = RequestMethod.POST, value = "/addOrUpStopPreg")
34 34 @ResponseBody
35   - public BaseResponse addOrUpStopPreg(@Valid @RequestBody StopPregRequest request) {
36   - if (!StringUtils.isEmpty(request.getId()))
  35 + @TokenRequired
  36 + public BaseResponse addOrUpStopPreg(@Valid @RequestBody StopPregRequest params,HttpServletRequest request) {
  37 + if (!StringUtils.isEmpty(params.getId()))
37 38 {
38   - return stopPregnancyFacade.updateStopPreg(request);
  39 + return stopPregnancyFacade.updateStopPreg(params);
39 40 }
40   - return stopPregnancyFacade.addStopPreg(request);
  41 +
  42 + LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
  43 + return stopPregnancyFacade.addStopPreg(params,loginState.getId());
41 44 }
42 45  
43 46 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ e61c082
... ... @@ -380,14 +380,24 @@
380 380 MaternalDeliverModel model = modelList.get(0);
381 381 dueDate = model.getDueDate();
382 382 } else {
383   - //终止妊娠
384   - StopPregQuery query = new StopPregQuery();
385   - query.setYn(YnEnums.YES.getId());
386   - query.setPid(patients.getPid());
387   - stopPregs = stopPregnancyService.queryStopPreg(query);
388   - if (CollectionUtils.isNotEmpty(stopPregs)) {
389   - dueDate = DateUtil.getyyyy_MM_dd(stopPregs.get(0).getStopDate());
  383 + PatientsQuery query1 = new PatientsQuery();
  384 + query1.setCardNo(exListQueryRequest.getCardNo());
  385 + query1.setYn(YnEnums.YES.getId());
  386 + List<Patients> pats = patientsService.queryPatient(query1);
  387 + if (CollectionUtils.isNotEmpty(pats))
  388 + {
  389 +
  390 + //终止妊娠
  391 + StopPregQuery query = new StopPregQuery();
  392 + query.setYn(YnEnums.YES.getId());
  393 + query.setPatientId(patients.getId());
  394 + stopPregs = stopPregnancyService.queryStopPreg(query);
  395 + if (CollectionUtils.isNotEmpty(stopPregs)) {
  396 + dueDate = DateUtil.getyyyy_MM_dd(stopPregs.get(0).getStopDate());
  397 + }
390 398 }
  399 +
  400 +
391 401 }
392 402 PostReviewQuery postReviewQuery = new PostReviewQuery();
393 403  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ e61c082
... ... @@ -165,10 +165,8 @@
165 165 * @return
166 166 */
167 167 public BaseObjectResponse addBabyBookbuilding(BabyBookbuildingAddRequest request) {
  168 + BaseObjectResponse br = new BaseObjectResponse();
168 169  
169   -
170   -// Patients ppatients = patientsService.findLastBuildRecord("579b15d1231a17fcf5579bec",YnEnums.YES.getId());
171   -// return null;
172 170 //判断儿童是否建档在该医院
173 171 if (StringUtils.isNotEmpty(request.getMommyPhone()) || StringUtils.isNotEmpty(request.getMommyCertificateNum()))
174 172 {
... ... @@ -185,7 +183,6 @@
185 183 List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
186 184 if (CollectionUtils.isNotEmpty(models))
187 185 {
188   - BaseObjectResponse br = new BaseObjectResponse();
189 186 br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
190 187 br.setErrormsg("儿童在医院已经建档");
191 188 return br;
... ... @@ -217,42 +214,6 @@
217 214 }
218 215  
219 216  
220   -// Patients patients = null;
221   -// PersonModel resperson = null;
222   -// if (request.getMommyPhone() != null || request.getMommyCertificateNum() != null)
223   -// {
224   -// //查询儿童基本信息
225   -// PersonModelQuery personModelQuery = new PersonModelQuery();
226   -//// personModelQuery.setPhone(request.getMommyPhone());
227   -// personModelQuery.setYn(YnEnums.YES.getId());
228   -// personModelQuery.setName(request.getBabyName());
229   -// personModelQuery.setType(2);
230   -// personModelQuery.setCardNo(request.getMommyCertificateNum());
231   -// List<PersonModel> personModels = personService.queryPersons(personModelQuery);
232   -//
233   -// //更新儿童基本信息的内容
234   -// PersonModel pmodel = new PersonModel();
235   -// pmodel.setName(request.getBabyName());
236   -// pmodel.setBirth(DateUtil.parseYMD(request.getBabyBirthday()));
237   -// pmodel.setPhone(request.getMommyPhone());
238   -// pmodel.setCardNo(request.getMommyCertificateNum());
239   -// pmodel.setType(2);
240   -// pmodel.setYn(YnEnums.YES.getId());
241   -// pmodel.setModified(new Date());
242   -// if (CollectionUtils.isNotEmpty(personModels) && personModels.get(0) != null)
243   -// {
244   -// resperson = personModels.get(0);
245   -// personService.updatePerson(pmodel,personModels.get(0).getId());
246   -// }
247   -// else
248   -// {
249   -// pmodel.setYn(YnEnums.YES.getId());
250   -// pmodel.setCreated(new Date());
251   -// resperson = personService.addPerson(pmodel);
252   -// }
253   -// }
254   -
255   -
256 217 //查询孕妇或者产妇建档的基本信息
257 218 PersonModelQuery personYunModelQuery = new PersonModelQuery();
258 219 // personYunModelQuery.setPhone(request.getMommyPhone());
259 220  
260 221  
... ... @@ -272,17 +233,26 @@
272 233 List<Patients> pats = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
273 234 if (CollectionUtils.isNotEmpty(pats))
274 235 {
275   - patients = pats.get(0);
276   - }
277   - //当前状态为 孕妇状态
278   - if (pm.getType() != null && pm.getType() == 1)
279   - {
280   - boolean isUpdatePatStatus = false;
281   - for(Patients pat : pats)
  236 +
  237 + //当前状态为 孕妇状态
  238 + if (pm.getType() != null && pm.getType() == 1)
282 239 {
283   - if (pat != null) {
284   - if (pat.getType() == 1) {
  240 + boolean isUpdatePatStatus = false;
  241 + for(Patients pat : pats)
  242 + {
  243 + if (pat == null)
  244 + {
  245 + continue;
  246 + }
285 247  
  248 + //找到当前医院的孕妇建档
  249 + if (pat.getHospitalId() != null && pat.getHospitalId().equals(request.getHospitalId()))
  250 + {
  251 + patients = pat;
  252 + }
  253 +
  254 + if (pat.getType() != null && pat.getType() == 1) {
  255 +
286 256 //判断在儿童建档的时候，是否设置到这个儿童对应的孕妇 设置成产妇
287 257 //计算规则 儿童生日 >= 孕妇末次月经 + 24周 设置成分娩 (高帆 2016-08-09 16:47定 )
288 258 Date lastMenses = pat.getLastMenses();
... ... @@ -294,6 +264,7 @@
294 264 Patients patientUpdate = new Patients();
295 265 patientUpdate.setYn(YnEnums.YES.getId());
296 266 patientUpdate.setType(3);
  267 + patientUpdate.setFmDate(StringUtils.isEmpty(request.getDueDate()) ? DateUtil.parseYMD(request.getBabyBirthday()) : DateUtil.parseYMD(request.getDueDate()));
297 268 patientsService.updatePatientByPid(patientUpdate, pm.getId());
298 269 if (!isUpdatePatStatus)
299 270 {
300 271  
301 272  
... ... @@ -304,14 +275,15 @@
304 275 }
305 276 }
306 277 }
307   - }
308 278  
309   - if (isUpdatePatStatus)
310   - {
311   - pm.setType(3);//基本信息更新成产妇
312   - personService.updatePerson(pm,pm.getId());
  279 + if (isUpdatePatStatus)
  280 + {
  281 + pm.setType(3);//基本信息更新成产妇
  282 + personService.updatePerson(pm,pm.getId());
  283 + }
313 284 }
314 285 }
  286 +
315 287 }
316 288 }
317 289 //没有孕妇基本信息就新建产妇建档 和基本信息
... ... @@ -338,6 +310,13 @@
338 310 }
339 311  
340 312  
  313 + if (patients == null)
  314 + {
  315 + br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
  316 + br.setErrormsg("失败");
  317 + return br;
  318 + }
  319 +
341 320 BabyModel model = getBabyModel(request);
342 321 model.setPid(babyPersonId);
343 322  
... ... @@ -361,7 +340,7 @@
361 340 model.setCreated(new Date());
362 341 model.setModified(new Date());
363 342 model = babyBookbuildingService.addBabyBookbuilding(model);
364   - BaseObjectResponse br = new BaseObjectResponse();
  343 +
365 344 if (model == null || model.getId() == null) {
366 345 br.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
367 346 br.setErrormsg("失败");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java View file @ e61c082
... ... @@ -14,12 +14,10 @@
14 14 import com.lyms.platform.permission.model.Users;
15 15 import com.lyms.platform.permission.model.UsersQuery;
16 16 import com.lyms.platform.permission.service.UsersService;
17   -import com.lyms.platform.pojo.AntExChuModel;
18   -import com.lyms.platform.pojo.BasicConfig;
19   -import com.lyms.platform.pojo.Patients;
20   -import com.lyms.platform.pojo.StopPregModel;
  17 +import com.lyms.platform.pojo.*;
21 18 import com.lyms.platform.query.AntExChuQuery;
22 19 import com.lyms.platform.query.PatientsQuery;
  20 +import com.lyms.platform.query.PersonModelQuery;
23 21 import com.lyms.platform.query.StopPregQuery;
24 22 import org.apache.commons.collections.CollectionUtils;
25 23 import org.springframework.beans.factory.annotation.Autowired;
26 24  
... ... @@ -50,7 +48,10 @@
50 48 @Autowired
51 49 private YunBookbuildingService yunBookbuildingService;
52 50  
  51 + @Autowired
  52 + private PersonService personService;
53 53  
  54 +
54 55 /**
55 56 * 更新终止妊娠
56 57 * @param request
57 58  
58 59  
59 60  
60 61  
61 62  
62 63  
63 64  
64 65  
65 66  
66 67  
67 68  
... ... @@ -72,44 +73,80 @@
72 73 * @param request
73 74 * @return
74 75 */
75   - public BaseResponse addStopPreg(StopPregRequest request) {
  76 + public BaseResponse addStopPreg(StopPregRequest request,Integer userId) {
76 77  
  78 +// String hospitalId = "";
  79 +// //得到当前登录的医院id
  80 +// if (userId != null)
  81 +// {
  82 +// Users dbuser = usersService.getUsers(userId);
  83 +// if (dbuser != null) {
  84 +// hospitalId = String.valueOf(dbuser.getOrgId());
  85 +// }
  86 +// }
77 87  
  88 +
78 89 PatientsQuery patientsQuery = new PatientsQuery();
79 90 patientsQuery.setYn(YnEnums.YES.getId());
80 91 patientsQuery.setType(1);
81   - patientsQuery.setId(request.getId());
82   - patientsQuery.setHospitalId(request.getHospitalId());
  92 + patientsQuery.setPid(request.getPid());
83 93  
  94 + Patients pat = null;
84 95 List<Patients> patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
85 96 if (CollectionUtils.isNotEmpty(patients))
86 97 {
87   - Patients patient = patients.get(0);
88   - if (patient != null)
89   - {
90   - patient.setModified(new Date());
91   - patient.setDueStatus(1);
92 98  
93   - //更新状态为过期
94   - //判断其为增值服务还是 标准服务
95   - if (patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId())
  99 + for (Patients patient : patients)
  100 + {
  101 + if (patient != null)
96 102 {
97   - patient.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId());
98   - }
99   - else if (patient.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId())
100   - {
101   - patient.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId());
102   - }
103   - patient.setDueDate(new Date());
104   - patient.setType(3);
105 103  
106   - //分娩状态 0未终止妊娠 1终止妊娠
107   - yunBookbuildingService.updatePregnant(patient, request.getPid());
  104 + String hid = patient.getHospitalId();
  105 + if (StringUtils.isNotEmpty(hid) && hid.equals(request.getHospitalId()))
  106 + {
  107 + pat = patient;
  108 + }
  109 +
  110 + patient.setModified(new Date());
  111 + //终止妊娠状态
  112 + patient.setDueStatus(1);
  113 +
  114 + //更新状态为过期
  115 + //判断其为增值服务还是 标准服务
  116 + if (patient.getServiceType() == ServiceTypeEnums.STANDARD_SERVICE.getId())
  117 + {
  118 + patient.setServiceStatus(ServiceStatusEnums.STANDARD_OVERDUE.getId());
  119 + }
  120 + else if (patient.getServiceType() == ServiceTypeEnums.ADD_SERVICE.getId())
  121 + {
  122 + patient.setServiceStatus(ServiceStatusEnums.ADD_OVERDUE.getId());
  123 + }
  124 + patient.setFmDate(DateUtil.parseYMD(request.getStopDate()));
  125 + patient.setType(3);
  126 +
  127 + //分娩状态 0未终止妊娠 1终止妊娠
  128 + yunBookbuildingService.updatePregnant(patient,patient.getId());
  129 + }
108 130 }
109 131  
  132 + //更新孕妇基本信息为产妇
  133 + PersonModel pmodel = new PersonModel();
  134 + pmodel.setType(3);
  135 + pmodel.setModified(new Date());
  136 +
  137 + personService.updatePerson(pmodel, request.getPid());
110 138 }
111 139  
  140 + if (pat != null)
  141 + {
  142 + BaseResponse objectResponse = new BaseResponse();
  143 + objectResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
  144 + objectResponse.setErrormsg("数据异常");
  145 + return objectResponse;
  146 + }
  147 +
112 148 StopPregModel model = getStopPregModel(request);
  149 + model.setPatientId(pat.getId());
113 150 model.setCreated(new Date());
114 151 model.setModified(new Date());
115 152  
... ... @@ -123,7 +160,6 @@
123 160 private StopPregModel getStopPregModel(StopPregRequest request) {
124 161 StopPregModel model = new StopPregModel();
125 162  
126   - model.setPid(request.getPid());
127 163 model.setYn(YnEnums.YES.getId());
128 164 model.setInPerson(request.getInPerson());
129 165 model.setRemark(request.getRemark());
130 166  
... ... @@ -145,14 +181,14 @@
145 181 Map map = new HashMap();
146 182 StopPregQuery query = new StopPregQuery();
147 183 query.setYn(YnEnums.YES.getId());
148   - query.setPid(pid);
  184 + query.setPatientId(pid);
149 185 StopPregResult result = null;
150 186 List<StopPregModel> stopPregs = stopPregnancyService.queryStopPreg(query);
151 187 if (CollectionUtils.isNotEmpty(stopPregs))
152 188 {
153 189 StopPregModel model = stopPregs.get(0);
154 190 result = new StopPregResult();
155   - result.setPid(model.getPid());
  191 + result.setPatientId(model.getPatientId());
156 192 result.setRemark(model.getRemark());
157 193 result.setId(model.getId());
158 194 result.setStopDate(DateUtil.getyyyy_MM_dd(model.getStopDate()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/StopPregRequest.java View file @ e61c082
... ... @@ -12,9 +12,9 @@
12 12 */
13 13 public class StopPregRequest {
14 14 private String id;
15   - //孕妇建档id
  15 + //孕妇建档基本信息ID
16 16 @FormParam
17   - @NotEmpty(message = "孕妇建档id不能为空.")
  17 + @NotEmpty(message = "孕妇基本信息ID不能为空.")
18 18 private String pid;
19 19  
20 20 //终止原因
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/StopPregResult.java View file @ e61c082
... ... @@ -9,7 +9,7 @@
9 9 public class StopPregResult {
10 10 private String id;
11 11 //孕妇建档id
12   - private String pid;
  12 + private String patientId;
13 13  
14 14 //终止原因
15 15 private Map stopReason;
16 16  
... ... @@ -31,12 +31,12 @@
31 31 this.id = id;
32 32 }
33 33  
34   - public String getPid() {
35   - return pid;
  34 + public String getPatientId() {
  35 + return patientId;
36 36 }
37 37  
38   - public void setPid(String pid) {
39   - this.pid = pid;
  38 + public void setPatientId(String patientId) {
  39 + this.patientId = patientId;
40 40 }
41 41  
42 42 public Map getStopReason() {