shiyang / regional-platform

Download as
Browse Code »

Commit 50807e32fbae417d2f5687fd94cd1427e1531195

Authored by jiangjiazhi
1 parent d6134a0d23
Exists in master and in 1 other branch nobuildprocess

孕妇分娩后 变成产妇

Showing 5 changed files with 220 additions and 61 deletions

platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java View file @ 50807e3
... ... @@ -16,6 +16,23 @@
16 16 */
17 17 public final class StringUtils {
18 18  
  19 +
  20 +
  21 + //体重克算成千克
  22 + public static String cutBabyWeight(String babyWeight){
  23 + if(StringUtils.isEmpty(babyWeight)){
  24 + return babyWeight;
  25 + }
  26 + if(babyWeight.length()<=3){
  27 + babyWeight = org.apache.commons.lang.StringUtils.leftPad(babyWeight, 4,"0");
  28 + }
  29 + StringBuilder stringBuilder=new StringBuilder(babyWeight);
  30 + if(babyWeight.length()>2){
  31 + stringBuilder.setLength(babyWeight.length()-1);
  32 + }
  33 + stringBuilder.insert(stringBuilder.length() - 2,".");
  34 + return stringBuilder.toString();
  35 + }
19 36 public static Object isEmpty(Object obj, Object defaultVal) {
20 37 if (null == obj) {
21 38 return defaultVal;
platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java View file @ 50807e3
... ... @@ -4,6 +4,7 @@
4 4  
5 5 import java.util.Date;
6 6 import java.util.List;
  7 +import java.util.Map;
7 8  
8 9 /**
9 10 * 产妇分娩
10 11  
... ... @@ -72,24 +73,24 @@
72 73 private String loseBloodCause;
73 74 //产科并发症
74 75 private String ocs;
75   - /* //胎盘娩出方式
76   - private String tpmcType;
77   - //娩出方式
78   - private String mcType;
79   - // 胎盘大小
80   - private String tpSize;
81   - // 胎盘重量
82   - private String tpWeight;
83   - //脐带长度
84   - private String umbilicalCordLength;
85   - // 脐带异常
86   - private String umbilicalCordEx;
87   - // 脐带异常类型
88   - private String umbilicalCordExType;*/
  76 + /* //胎盘娩出方式
  77 + private String tpmcType;
  78 + //娩出方式
  79 + private String mcType;
  80 + // 胎盘大小
  81 + private String tpSize;
  82 + // 胎盘重量
  83 + private String tpWeight;
  84 + //脐带长度
  85 + private String umbilicalCordLength;
  86 + // 脐带异常
  87 + private String umbilicalCordEx;
  88 + // 脐带异常类型
  89 + private String umbilicalCordExType;*/
89 90 private List<ExtPlacenta> extPlacentas;
90 91  
91 92 //存放新生儿表的id
92   - private List<String> baby;
  93 + private List<Baby> baby;
93 94 //分娩医院
94 95 private String fmHospital;
95 96 //接生医生
... ... @@ -123,7 +124,133 @@
123 124 this.modified = modified;
124 125 }
125 126  
126   - public static class ExtPlacenta{
  127 + public static class Baby {
  128 +
  129 + private String id;
  130 + //新生儿性别;
  131 + private String babyGender;
  132 + //新生儿重量
  133 + private String babyWeight;
  134 + //新生儿生长
  135 + private String babyHeight;
  136 + //畸形 0非畸形 1畸形
  137 + private Integer deformity;
  138 + //apgar评分
  139 + private String apgarScore;
  140 + //窒息分钟
  141 + private String asphyxiaM;
  142 + // 妊娠结局
  143 + private String pregnancyOut;
  144 + //新生儿疾病
  145 + private String babyHealthy;
  146 + //母婴接触开始
  147 + private String contactStartM;
  148 + //母婴接触时间
  149 + private String contactM;
  150 + //早吮吸
  151 + private String earlySuck;
  152 + public Baby(){
  153 +
  154 + }
  155 +
  156 + public String getApgarScore() {
  157 + return apgarScore;
  158 + }
  159 +
  160 + public void setApgarScore(String apgarScore) {
  161 + this.apgarScore = apgarScore;
  162 + }
  163 +
  164 + public String getAsphyxiaM() {
  165 + return asphyxiaM;
  166 + }
  167 +
  168 + public void setAsphyxiaM(String asphyxiaM) {
  169 + this.asphyxiaM = asphyxiaM;
  170 + }
  171 +
  172 + public String getBabyGender() {
  173 + return babyGender;
  174 + }
  175 +
  176 + public void setBabyGender(String babyGender) {
  177 + this.babyGender = babyGender;
  178 + }
  179 +
  180 + public String getBabyHealthy() {
  181 + return babyHealthy;
  182 + }
  183 +
  184 + public void setBabyHealthy(String babyHealthy) {
  185 + this.babyHealthy = babyHealthy;
  186 + }
  187 +
  188 + public String getBabyHeight() {
  189 + return babyHeight;
  190 + }
  191 +
  192 + public void setBabyHeight(String babyHeight) {
  193 + this.babyHeight = babyHeight;
  194 + }
  195 +
  196 + public String getBabyWeight() {
  197 + return babyWeight;
  198 + }
  199 +
  200 + public void setBabyWeight(String babyWeight) {
  201 + this.babyWeight = babyWeight;
  202 + }
  203 +
  204 + public String getContactM() {
  205 + return contactM;
  206 + }
  207 +
  208 + public void setContactM(String contactM) {
  209 + this.contactM = contactM;
  210 + }
  211 +
  212 + public String getContactStartM() {
  213 + return contactStartM;
  214 + }
  215 +
  216 + public void setContactStartM(String contactStartM) {
  217 + this.contactStartM = contactStartM;
  218 + }
  219 +
  220 + public Integer getDeformity() {
  221 + return deformity;
  222 + }
  223 +
  224 + public void setDeformity(Integer deformity) {
  225 + this.deformity = deformity;
  226 + }
  227 +
  228 + public String getEarlySuck() {
  229 + return earlySuck;
  230 + }
  231 +
  232 + public void setEarlySuck(String earlySuck) {
  233 + this.earlySuck = earlySuck;
  234 + }
  235 +
  236 + public String getId() {
  237 + return id;
  238 + }
  239 +
  240 + public void setId(String id) {
  241 + this.id = id;
  242 + }
  243 +
  244 + public String getPregnancyOut() {
  245 + return pregnancyOut;
  246 + }
  247 +
  248 + public void setPregnancyOut(String pregnancyOut) {
  249 + this.pregnancyOut = pregnancyOut;
  250 + }
  251 + }
  252 +
  253 + public static class ExtPlacenta {
127 254 //胎盘娩出方式
128 255 private String tpmcType;
129 256 //娩出方式
... ... @@ -195,6 +322,7 @@
195 322 this.umbilicalCordLength = umbilicalCordLength;
196 323 }
197 324 }
  325 +
198 326 public Integer getYn() {
199 327 return yn;
200 328 }
201 329  
... ... @@ -203,11 +331,11 @@
203 331 this.yn = yn;
204 332 }
205 333  
206   - public List<String> getBaby() {
  334 + public List<Baby> getBaby() {
207 335 return baby;
208 336 }
209 337  
210   - public void setBaby(List<String> baby) {
  338 + public void setBaby(List<Baby> baby) {
211 339 this.baby = baby;
212 340 }
213 341  
... ... @@ -306,7 +434,6 @@
306 434 public void setMaternalInfo(String maternalInfo) {
307 435 this.maternalInfo = maternalInfo;
308 436 }
309   -
310 437  
311 438  
312 439 public Integer getNeedleNum() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 50807e3
... ... @@ -59,6 +59,7 @@
59 59 * @return
60 60 */
61 61 public BaseResponse addOrUpdateMatDeliver(MatDeliverAddRequest deliverAddRequest, Integer userId) {
  62 + List<MaternalDeliverModel.Baby> babyList = new ArrayList<>();
62 63 //增加
63 64 if (StringUtils.isEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) {
64 65 MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel();
65 66  
66 67  
67 68  
68 69  
69 70  
70 71  
... ... @@ -69,30 +70,51 @@
69 70 PatientsQuery patientsQuery = new PatientsQuery();
70 71 patientsQuery.setId(parentId);
71 72 List<Patients> patients = patientsService.queryPatient(patientsQuery);
72   - Patients patients1 =null;
  73 + Patients patients1 = null;
73 74 if (CollectionUtils.isNotEmpty(list)) {
74 75 String userName = "";
75 76 if (CollectionUtils.isNotEmpty(patients)) {
76   - patients1=patients.get(0);
77   - userName =patients1 .getUsername();
  77 + patients1 = patients.get(0);
  78 + userName = patients1.getUsername();
78 79 if (null != deliverAddRequest.getDueDate()) {
79 80 Date fmDate = DateUtil.parseYMD(deliverAddRequest.getDueDate());
80 81 patients1.setFmDate(fmDate);
81 82 patients1.setType(3);
82 83 patientsService.updatePatient(patients1);
83 84 //修改person表状态为产妇
84   - if(StringUtils.isNotEmpty(patients1.getPid())){
85   - PersonModel personModel=new PersonModel();
  85 + if (StringUtils.isNotEmpty(patients1.getPid())) {
  86 + PersonModel personModel = new PersonModel();
86 87 personModel.setType(3);
87 88 personModel.setId(patients1.getPid());
88 89 personModel.setModified(new Date());
89   - personService.updatePerson(personModel,patients1.getPid());
  90 + personService.updatePerson(personModel, patients1.getPid());
90 91 }
91 92 }
92 93 }
  94 +
93 95 for (MatDeliverAddRequest.Baby baby : list) {
  96 + MaternalDeliverModel.Baby baby1 = baby.convertToDataModel();
  97 + babyList.add(baby1);
94 98  
95   - BabyModel babyModel = baby.convertToDataModel();
  99 + BabyModel babyModel = new BabyModel();
  100 + baby.setId(baby1.getId());
  101 + babyModel.setBirth(new Date());
  102 + babyModel.setYn(YnEnums.YES.getId());
  103 + babyModel.setVisitstatus(VisitStatusEnums.UNVISIT.getId());
  104 + babyModel.setAsphyxiaM(baby1.getAsphyxiaM());
  105 + if (null != baby1.getBabyGender()) {
  106 + babyModel.setSex(Integer.valueOf(baby1.getBabyGender()));
  107 + }
  108 + babyModel.setApgarScore(baby1.getApgarScore());
  109 + babyModel.setModified(new Date());
  110 + babyModel.setBabyHealthy(baby1.getBabyHealthy());
  111 + babyModel.setBabyWeight(com.lyms.platform.common.utils.StringUtils.cutBabyWeight(baby1.getBabyWeight()));
  112 + babyModel.setBabyHeight(baby1.getBabyHeight());
  113 + babyModel.setMalformation(baby1.getDeformity());
  114 + babyModel.setPregnancyOut(baby1.getPregnancyOut());
  115 + babyModel.setContactM(baby1.getContactM());
  116 + babyModel.setContactStartM(baby1.getContactStartM());
  117 + babyModel.setEarlySuck(baby1.getEarlySuck());
96 118 babyModel.setParentId(parentId);
97 119 babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女"));
98 120 babyModel.setYn(YnEnums.NO.getId());
99 121  
100 122  
101 123  
102 124  
... ... @@ -108,29 +130,30 @@
108 130 }
109 131 babyIds.add(babyService.addOneBaby(babyModel).getId());
110 132 }
  133 + maternalDeliverModel.setBaby(babyList);
111 134 }
112 135 List list1 = autoMatchFacade.matchOrgId(userId);
113 136 if (CollectionUtils.isNotEmpty(list1)) {
114 137 maternalDeliverModel.setHospitalId(list1.get(0) + "");
115 138 }
116   - maternalDeliverModel.setBaby(babyIds);
  139 +
117 140 maternalDeliverModel.setYn(YnEnums.YES.getId());
118 141 matDeliverService.addMatDeliver(maternalDeliverModel);
119 142 //修改
120 143 } else if (StringUtils.isNotEmpty(deliverAddRequest.getId()) && StringUtils.isNotEmpty(deliverAddRequest.getParentId())) {
121 144 MaternalDeliverModel maternalDeliverModel = deliverAddRequest.convertToDataModel();
122 145  
  146 +
123 147 matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
124 148 //获取到小孩信息
125 149 List<MatDeliverAddRequest.Baby> list = deliverAddRequest.getBabies();
126 150 //修改小孩信息
127 151 if (CollectionUtils.isNotEmpty(list)) {
128 152 for (MatDeliverAddRequest.Baby baby : list) {
129   - BabyModel babyModel = baby.convertToDataModel();
130   - if (StringUtils.isNotEmpty(babyModel.getId())) {
131   - babyService.updateOneBaby(babyModel, babyModel.getId());
132   - }
  153 + MaternalDeliverModel.Baby babyModel = baby.convertToDataModel();
  154 + babyList.add(babyModel);
133 155 }
  156 + maternalDeliverModel.setBaby(babyList);
134 157 }
135 158 if (null != deliverAddRequest.getDueDate()) {
136 159 Date fmDate = DateUtil.parseYMD(deliverAddRequest.getDueDate());
137 160  
... ... @@ -241,14 +264,11 @@
241 264  
242 265 maternalDeliverResult.convertToResult(deliverModel);
243 266 //获取新生儿信息
244   - List<String> babyIdList = deliverModel.getBaby();
  267 + List<MaternalDeliverModel.Baby> babyIdList = deliverModel.getBaby();
245 268 List babyList = new ArrayList();
246 269 if (CollectionUtils.isNotEmpty(babyIdList)) {
247   - for (String babyId : babyIdList) {
248   - BabyModel babyModel = babyService.getOneBabyById(babyId);
249   - if (null != babyModel) {
250   - babyList.add(maternalDeliverResult.new Baby(babyModel));
251   - }
  270 + for (MaternalDeliverModel.Baby baby : babyIdList) {
  271 + babyList.add(maternalDeliverResult.new Baby(baby));
252 272 }
253 273 }
254 274  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java View file @ 50807e3
... ... @@ -416,7 +416,7 @@
416 416 }
417 417 }
418 418  
419   - public static class Baby implements IBasicRequestConvert<BabyModel>{
  419 + public static class Baby implements IBasicRequestConvert<MaternalDeliverModel.Baby>{
420 420  
421 421 private String id;
422 422 //新生儿性别;
423 423  
424 424  
425 425  
... ... @@ -443,30 +443,25 @@
443 443 private String earlySuck;
444 444  
445 445 @Override
446   - public BabyModel convertToDataModel() {
447   - BabyModel babyModel= new BabyModel();
448   - babyModel.setId(id);
449   - babyModel.setBirth(new Date());
450   - babyModel.setYn(YnEnums.YES.getId());
451   - babyModel.setVisitstatus(VisitStatusEnums.UNVISIT.getId());
452   - babyModel.setAsphyxiaM(asphyxiaM);
  446 + public MaternalDeliverModel.Baby convertToDataModel() {
  447 + MaternalDeliverModel.Baby baby= new MaternalDeliverModel.Baby();
  448 + baby.setId(id);
  449 + baby.setAsphyxiaM(asphyxiaM);
453 450 if(null!=babyGender){
454   - babyModel.setSex(Integer.valueOf(babyGender));
  451 + baby.setBabyGender(babyGender);
455 452 }
456 453 if(null!=apgarScore){
457   - babyModel.setApgarScore(JsonUtil.obj2JsonString(apgarScore));
  454 + baby.setApgarScore(JsonUtil.obj2JsonString(apgarScore));
458 455 }
459   - babyModel.setModified(new Date());
460   - babyModel.setBabyHealthy(babyHealthy);
461   - babyModel.setBabyWeight(babyWeight);
462   - babyModel.setBabyHeight(babyHeight);
463   - babyModel.setMalformation(deformity);
464   -
465   - babyModel.setPregnancyOut(pregnancyOut);
466   - babyModel.setContactM(contactM);
467   - babyModel.setContactStartM(contactStartM);
468   - babyModel.setEarlySuck(earlySuck);
469   - return babyModel;
  456 + baby.setBabyHealthy(babyHealthy);
  457 + baby.setBabyWeight(babyWeight);
  458 + baby.setBabyHeight(babyHeight);
  459 + baby.setDeformity(deformity);
  460 + baby.setPregnancyOut(pregnancyOut);
  461 + baby.setContactM(contactM);
  462 + baby.setContactStartM(contactStartM);
  463 + baby.setEarlySuck(earlySuck);
  464 + return baby;
470 465 }
471 466  
472 467  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java View file @ 50807e3
... ... @@ -181,12 +181,12 @@
181 181 //早吮吸
182 182 private String earlySuck;
183 183  
184   - public Baby(BabyModel babyModel){
  184 + public Baby(MaternalDeliverModel.Baby babyModel){
185 185 setId(babyModel.getId());
186   - setBabyGender(babyModel.getSex()+"");
  186 + setBabyGender(babyModel.getBabyGender()+"");
187 187 setBabyWeight(babyModel.getBabyWeight());
188 188 setBabyHeight(babyModel.getBabyHeight());
189   - setDeformity(babyModel.getMalformation());
  189 + setDeformity(babyModel.getDeformity());
190 190 setApgarScore(JsonUtil.str2Obj(babyModel.getApgarScore(),Map.class));
191 191 setAsphyxiaM(babyModel.getAsphyxiaM());
192 192 setPregnancyOut(babyModel.getPregnancyOut());