Commit 8aebcc6eff9ba68535dac0a755acfda0ae94b502
1 parent
2e4b96e7e8
Exists in
master
and in
8 other branches
孕妇分娩后 变成产妇
Showing 2 changed files with 55 additions and 40 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
View file @
8aebcc6
| ... | ... | @@ -40,7 +40,7 @@ |
| 40 | 40 | @TokenRequired |
| 41 | 41 | public BaseResponse queryAntenatalExamination(@Valid AntenatalExaminationQueryRequest antenatalExaminationQueryRequest) { |
| 42 | 42 | if (StringUtils.isEmpty(antenatalExaminationQueryRequest.getCardNo()) && StringUtils.isEmpty(antenatalExaminationQueryRequest.getVcCardNo())) { |
| 43 | - return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请输入查询条件."); | |
| 43 | + return new BaseResponse().setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("请输入查询条件"); | |
| 44 | 44 | } |
| 45 | 45 | return antenatalExaminationFacade.queryAntenatalExamination(antenatalExaminationQueryRequest); |
| 46 | 46 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
View file @
8aebcc6
| ... | ... | @@ -92,45 +92,7 @@ |
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - for (MatDeliverAddRequest.Baby baby : list) { | |
| 96 | - MaternalDeliverModel.Baby baby1 = baby.convertToDataModel(); | |
| 97 | - babyList.add(baby1); | |
| 98 | - | |
| 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()); | |
| 118 | - babyModel.setParentId(parentId); | |
| 119 | - babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女")); | |
| 120 | - babyModel.setYn(YnEnums.NO.getId()); | |
| 121 | - //判断妊娠结局是活产才添加数据 | |
| 122 | - if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { | |
| 123 | - babyModel.setYn(YnEnums.YES.getId()); | |
| 124 | - PersonModel personModel = new PersonModel(); | |
| 125 | - personModel.setType(2); | |
| 126 | - personModel.setYn(YnEnums.YES.getId()); | |
| 127 | - personModel.setBirth(DateUtil.parseYMD(deliverAddRequest.getDueDate())); | |
| 128 | - personModel.setModified(new Date()); | |
| 129 | - babyModel.setPid(personService.addPerson(personModel).getId()); | |
| 130 | - } | |
| 131 | - babyIds.add(babyService.addOneBaby(babyModel).getId()); | |
| 132 | - } | |
| 133 | - maternalDeliverModel.setBaby(babyList); | |
| 95 | + handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName); | |
| 134 | 96 | } |
| 135 | 97 | List list1 = autoMatchFacade.matchOrgId(userId); |
| 136 | 98 | if (CollectionUtils.isNotEmpty(list1)) { |
| ... | ... | @@ -170,6 +132,59 @@ |
| 170 | 132 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("parentId 为空,找不到产妇"); |
| 171 | 133 | } |
| 172 | 134 | return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); |
| 135 | + } | |
| 136 | + | |
| 137 | + /** | |
| 138 | + * 处理儿童 | |
| 139 | + * | |
| 140 | + * @param deliverAddRequest | |
| 141 | + * @param babyList | |
| 142 | + * @param maternalDeliverModel | |
| 143 | + * @param list | |
| 144 | + * @param babyIds | |
| 145 | + * @param parentId | |
| 146 | + * @param userName | |
| 147 | + */ | |
| 148 | + private void handBaby(MatDeliverAddRequest deliverAddRequest, List<MaternalDeliverModel.Baby> babyList, MaternalDeliverModel maternalDeliverModel, List<MatDeliverAddRequest.Baby> list, List<String> babyIds, String parentId, String userName) { | |
| 149 | + for (MatDeliverAddRequest.Baby baby : list) { | |
| 150 | + MaternalDeliverModel.Baby baby1 = baby.convertToDataModel(); | |
| 151 | + babyList.add(baby1); | |
| 152 | + | |
| 153 | + BabyModel babyModel = new BabyModel(); | |
| 154 | + baby.setId(baby1.getId()); | |
| 155 | + babyModel.setBirth(new Date()); | |
| 156 | + babyModel.setYn(YnEnums.YES.getId()); | |
| 157 | + babyModel.setVisitstatus(VisitStatusEnums.UNVISIT.getId()); | |
| 158 | + babyModel.setAsphyxiaM(baby1.getAsphyxiaM()); | |
| 159 | + if (null != baby1.getBabyGender()) { | |
| 160 | + babyModel.setSex(Integer.valueOf(baby1.getBabyGender())); | |
| 161 | + } | |
| 162 | + babyModel.setApgarScore(baby1.getApgarScore()); | |
| 163 | + babyModel.setModified(new Date()); | |
| 164 | + babyModel.setBabyHealthy(baby1.getBabyHealthy()); | |
| 165 | + babyModel.setBabyWeight(com.lyms.platform.common.utils.StringUtils.cutBabyWeight(baby1.getBabyWeight())); | |
| 166 | + babyModel.setBabyHeight(baby1.getBabyHeight()); | |
| 167 | + babyModel.setMalformation(baby1.getDeformity()); | |
| 168 | + babyModel.setPregnancyOut(baby1.getPregnancyOut()); | |
| 169 | + babyModel.setContactM(baby1.getContactM()); | |
| 170 | + babyModel.setContactStartM(baby1.getContactStartM()); | |
| 171 | + babyModel.setEarlySuck(baby1.getEarlySuck()); | |
| 172 | + babyModel.setParentId(parentId); | |
| 173 | + babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女")); | |
| 174 | + babyModel.setYn(YnEnums.NO.getId()); | |
| 175 | + //判断妊娠结局是活产才添加数据 | |
| 176 | + if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { | |
| 177 | + babyModel.setYn(YnEnums.YES.getId()); | |
| 178 | + PersonModel personModel = new PersonModel(); | |
| 179 | + personModel.setType(2); | |
| 180 | + personModel.setYn(YnEnums.YES.getId()); | |
| 181 | + personModel.setBirth(DateUtil.parseYMD(deliverAddRequest.getDueDate())); | |
| 182 | + personModel.setModified(new Date()); | |
| 183 | + babyModel.setPid(personService.addPerson(personModel).getId()); | |
| 184 | + } | |
| 185 | + babyIds.add(babyService.addOneBaby(babyModel).getId()); | |
| 186 | + } | |
| 187 | + maternalDeliverModel.setBaby(babyList); | |
| 173 | 188 | } |
| 174 | 189 | |
| 175 | 190 |