jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9a8b60605dbe33749ca05ad27e5818da7db6a109

Authored by cpf
2 parents 431675b4f2 a74dd8e6da
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 7 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java View file @ 9a8b606
... ... @@ -226,5 +226,48 @@
226 226 this.name = name;
227 227 }
228 228 }
  229 +
  230 + public enum FmCesareanTimeType{
  231 +
  232 + a("1", "首次抛宫产"),
  233 + b("2", "二次分娩首次抛宫产"),
  234 + c("3", "二次抛宫产"),
  235 + d("4", "三次抛宫产");
  236 +
  237 +
  238 + FmCesareanTimeType(String id, String name) {
  239 + this.id = id;
  240 + this.name = name;
  241 + }
  242 +
  243 + private String id;
  244 + private String name;
  245 +
  246 + public String getId() {
  247 + return id;
  248 + }
  249 +
  250 + public void setId(String id) {
  251 + this.id = id;
  252 + }
  253 +
  254 + public String getName() {
  255 + return name;
  256 + }
  257 +
  258 + public void setName(String name) {
  259 + this.name = name;
  260 + }
  261 + }
  262 + public static String getFmCesareanTimeType(String id)
  263 + {
  264 + for (FmCesareanTimeType e : FmCesareanTimeType.values()) {
  265 + if (e.getId().equals(id))
  266 + {
  267 + return e.getName();
  268 + }
  269 + }
  270 + return null;
  271 + }
229 272 }
platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java View file @ 9a8b606
... ... @@ -2476,5 +2476,18 @@
2476 2476 public void setGjOther(String gjOther) {
2477 2477 this.gjOther = gjOther;
2478 2478 }
  2479 + /**抛宫产次数类型
  2480 + * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产
  2481 + */
  2482 + private Integer cesareanTimeType;
  2483 +
  2484 + public Integer getCesareanTimeType() {
  2485 + return cesareanTimeType;
  2486 + }
  2487 +
  2488 + public void setCesareanTimeType(Integer cesareanTimeType) {
  2489 + this.cesareanTimeType = cesareanTimeType;
  2490 + }
  2491 + /****************************************************/
2479 2492 }
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ 9a8b606
... ... @@ -410,6 +410,21 @@
410 410 //初诊时间
411 411 private Date firstCheckTime;
412 412  
  413 + /**抛宫产次数类型
  414 + * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产
  415 + */
  416 + private Integer cesareanTimeType;
  417 +
  418 + public Integer getCesareanTimeType() {
  419 + return cesareanTimeType;
  420 + }
  421 +
  422 + public void setCesareanTimeType(Integer cesareanTimeType) {
  423 + this.cesareanTimeType = cesareanTimeType;
  424 + }
  425 +
  426 + /****************************************************/
  427 +
413 428 public String getIsYyzyfmHospital() {
414 429 return isYyzyfmHospital;
415 430 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 9a8b606
... ... @@ -30,6 +30,7 @@
30 30 import com.lyms.platform.permission.service.UsersService;
31 31 import com.lyms.platform.pojo.*;
32 32 import com.lyms.platform.query.*;
  33 +import com.mchange.lang.IntegerUtils;
33 34 import org.apache.commons.collections.CollectionUtils;
34 35 import org.apache.commons.collections.MapUtils;
35 36 import org.apache.commons.collections.Transformer;
... ... @@ -294,6 +295,10 @@
294 295 }
295 296 }
296 297 Patients patients2 = patientsService.findOnePatientById(deliverAddRequest.getParentId());
  298 + //分娩类型是抛宫产-分娩次数类型
  299 + if(null!=maternalDeliverModel.getCesareanTimeType()){
  300 + patients2.setCesareanTimeType(maternalDeliverModel.getCesareanTimeType());
  301 + }
297 302 //增加
298 303 if (StringUtils.isEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) {
299 304 MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
... ... @@ -576,6 +581,10 @@
576 581 } catch (Exception e) {
577 582 System.out.println(patients1.getId() + "：这条数据的末日月经和分娩时间异常");
578 583 // 跳过
  584 + }
  585 + //分娩类型是抛宫产-分娩次数类型
  586 + if(null!=maternalDeliverModel.getCesareanTimeType()){
  587 + patients1.setCesareanTimeType(maternalDeliverModel.getCesareanTimeType());
579 588 }
580 589 // HuJiaqi添加结束
581 590 patientsService.updatePatient(patients1);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 9a8b606
... ... @@ -4007,6 +4007,12 @@
4007 4007 map.put("operationCause", data.getOperationCause() == null ? "--" : data.getOperationCause());
4008 4008 }
4009 4009  
  4010 + //抛宫产次数类型-展示页面
  4011 + String cesareanTimeType = "";
  4012 + if(null!=data.getCesareanTimeType()){
  4013 + cesareanTimeType=FmTypeEnums.getFmCesareanTimeType(data.getCesareanTimeType().toString());
  4014 + }
  4015 + map.put("cesareanTimeType",StringUtils.isNotEmpty(cesareanTimeType)?cesareanTimeType:null);
4010 4016 findProcess(data.getProdprocess(), map);//1,2,3产程
4011 4017 findTotalProcess(data.getTotalprocess(), map);//总产程
4012 4018  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java View file @ 9a8b606
... ... @@ -440,7 +440,20 @@
440 440 private String parturientTime; //临产时间
441 441 private String vaginaBloodAmount;//阴道出血量
442 442  
  443 + /**抛宫产次数类型
  444 + * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产
  445 + */
  446 + private Integer cesareanTimeType;
443 447  
  448 + public Integer getCesareanTimeType() {
  449 + return cesareanTimeType;
  450 + }
  451 +
  452 + public void setCesareanTimeType(Integer cesareanTimeType) {
  453 + this.cesareanTimeType = cesareanTimeType;
  454 + }
  455 + /****************************************************/
  456 +
444 457 @Override
445 458 public MaternalDeliverModel convertToDataModel() {
446 459 MaternalDeliverModel maternalDeliverModel = new MaternalDeliverModel();
... ... @@ -548,6 +561,9 @@
548 561  
549 562 maternalDeliverModel.setInHospitalNo(inHospitalNo);
550 563  
  564 + //抛宫产次数类型
  565 + maternalDeliverModel.setCesareanTimeType(cesareanTimeType);
  566 +
551 567 return maternalDeliverModel;
552 568 }
553 569  
... ... @@ -2465,6 +2481,7 @@
2465 2481 ", babies=" + babies.toString() +
2466 2482 ", fmHospital='" + fmHospital + '\'' +
2467 2483 ", deliverDoctor='" + deliverDoctor + '\'' +
  2484 + ", cesareanTimeType='" + cesareanTimeType + '\'' +
2468 2485 '}';
2469 2486 }
2470 2487  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java View file @ 9a8b606
... ... @@ -217,6 +217,21 @@
217 217 private String parturientTime; //临产时间
218 218 private String vaginaBloodAmount;//阴道出血量
219 219  
  220 + /**抛宫产次数类型
  221 + * 1：首次抛宫产 2：二次分娩首次抛宫产 3：二次抛宫产 4：三次抛宫产
  222 + */
  223 + private Integer cesareanTimeType;
  224 +
  225 + public Integer getCesareanTimeType() {
  226 + return cesareanTimeType;
  227 + }
  228 +
  229 + public void setCesareanTimeType(Integer cesareanTimeType) {
  230 + this.cesareanTimeType = cesareanTimeType;
  231 + }
  232 +
  233 + /****************************************************/
  234 +
220 235 public String getComment() {
221 236 return comment;
222 237 }
... ... @@ -656,6 +671,10 @@
656 671  
657 672 // 血肿
658 673 setXzType(destModel.getXzType());
  674 +
  675 + //抛宫产次数类型
  676 + setCesareanTimeType(null!=destModel.getCesareanTimeType()?destModel.getCesareanTimeType():null);
  677 +
659 678 return this;
660 679 }
661 680