jiangjiazhi / regional-platform

Download as
Browse Code »

Commit d2d0ae7d09a3d42b10bb34a7e5845a73a754d1ee

Authored by hujiaqi
1 parent e727784221
Exists in master and in 7 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping

设置自动分娩

Showing 5 changed files with 32 additions and 1 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java View file @ d2d0ae7
... ... @@ -220,6 +220,9 @@
220 220 patients.setBuildType(2);
221 221 patients.setFmDate(DateUtil.addDay(patients.getLastMenses(), 294));
222 222 patients.setModified(new Date());
  223 + // hujiaqi添加，是否自动分娩
  224 + patients.setIsAutoFm(YnEnums.YES.getId());
  225 + // hujiaqi添加结束
223 226 updatePatient(patients);
224 227 PersonModelQuery personYunModelQuery = new PersonModelQuery();
225 228 personYunModelQuery.setYn(YnEnums.YES.getId());
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ d2d0ae7
... ... @@ -245,6 +245,16 @@
245 245 // 分娩方式
246 246 private String fmType;
247 247  
  248 + private Integer isAutoFm;
  249 +
  250 + public Integer getIsAutoFm() {
  251 + return isAutoFm;
  252 + }
  253 +
  254 + public void setIsAutoFm(Integer isAutoFm) {
  255 + this.isAutoFm = isAutoFm;
  256 + }
  257 +
248 258 public String getFmHospital() {
249 259 return fmHospital;
250 260 }
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ d2d0ae7
... ... @@ -382,8 +382,17 @@
382 382 private Integer fmWeekEnd;
383 383 // 分娩方式
384 384 private String fmType;
  385 + // 是否自动分娩
  386 + private Integer isAutoFm = -1;
385 387  
  388 + public Integer getIsAutoFm() {
  389 + return isAutoFm;
  390 + }
386 391  
  392 + public void setIsAutoFm(Integer isAutoFm) {
  393 + this.isAutoFm = isAutoFm;
  394 + }
  395 +
387 396 public String getFileCode() {
388 397 return fileCode;
389 398 }
... ... @@ -1040,6 +1049,9 @@
1040 1049 }
1041 1050 if (-1 != yn) {
1042 1051 condition = condition.and("yn", yn, MongoOper.IS);
  1052 + }
  1053 + if (-1 != isAutoFm) {
  1054 + condition = condition.and("isAutoFm", isAutoFm, MongoOper.IS);
1043 1055 }
1044 1056 if (null != isNull) {
1045 1057 condition = condition.and("communityId", null, MongoOper.IS);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ d2d0ae7
... ... @@ -550,7 +550,11 @@
550 550 System.out.println(patients.getId() + "：这条数据的末日月经和分娩时间异常");
551 551 // 跳过
552 552 }
553   -
  553 + if(StringUtils.isNotEmpty(patients.getFmHospital())){
  554 + patients.setIsAutoFm(YnEnums.NO.getId());
  555 + }else{
  556 + patients.setIsAutoFm(YnEnums.YES.getId());
  557 + }
554 558  
555 559 System.out.println(patients.getFmAge());
556 560 System.out.println(patients.getFmWeek());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ d2d0ae7
... ... @@ -191,6 +191,7 @@
191 191 patientsLocal.setId(deliverAddRequest.getParentId());
192 192 patientsLocal.setFmDate(fmDate);
193 193 // HuJiaqi添加开始，这里冗余了分娩分娩医院，分娩年龄，分娩孕周，分娩方式，并将状态更改为产妇
  194 + patientsLocal.setIsAutoFm(YnEnums.NO.getId());
194 195 patientsLocal.setType(3);
195 196 patientsLocal.setFmHospital(deliverAddRequest.getFmHospital());
196 197 patientsLocal.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode())?null:deliverAddRequest.getDeliveryMode().toString());
... ... @@ -315,6 +316,7 @@
315 316 patients1.setFmDate(fmDate);
316 317 // HuJiaqi添加开始，这里冗余了分娩分娩医院，分娩年龄，分娩孕周，分娩方式，并将状态更改为产妇
317 318 patients1.setType(3);
  319 + patients1.setIsAutoFm(YnEnums.NO.getId());
318 320 patients1.setFmHospital(deliverAddRequest.getFmHospital());
319 321 patients1.setFmType(MapUtils.isNotEmpty(deliverAddRequest.getDeliveryMode())?null:deliverAddRequest.getDeliveryMode().toString());
320 322 try {