shiyang / regional-platform

Download as
Browse Code »

Commit 94a49db1260b329e2e66b53a8f9ffd43669866fb

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

孕妇分娩后 变成产妇

Showing 1 changed file with 35 additions and 13 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 94a49db
... ... @@ -92,7 +92,7 @@
92 92 }
93 93 }
94 94  
95   - handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName);
  95 + handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName,patients1);
96 96 }
97 97 List list1 = autoMatchFacade.matchOrgId(userId);
98 98 if (CollectionUtils.isNotEmpty(list1)) {
... ... @@ -136,15 +136,33 @@
136 136  
137 137 private BabyModel fillBaby(Patients patients){
138 138 BabyModel babyModel=new BabyModel();
139   - babyModel.setAreaId(patients.getAreaId());
140   - babyModel.setProvinceId(patients.getProvinceId());
141   - babyModel.setCityId(patients.getCityId());
142   - babyModel.setMname(patients.getUsername());
143   - babyModel.setMjob(patients.getPworkUnit());
144   - babyModel.setMphone(patients.getPhone());
145   - babyModel.setMbirth(patients.getBirth());
146   - babyModel.setFjob(patients.getHworkUnit());
147   - babyModel.setFphone(patients.getHusbandPhone());
  139 + if(null!=patients){
  140 + babyModel.setAreaId(patients.getAreaId());
  141 + babyModel.setProvinceId(patients.getProvinceId());
  142 + babyModel.setCityId(patients.getCityId());
  143 + babyModel.setStreetId(patients.getStreetId());
  144 + babyModel.setAddress(patients.getAddress());
  145 + //母亲信息
  146 + babyModel.setMname(patients.getUsername());
  147 + babyModel.setMjob(patients.getPworkUnit());
  148 + babyModel.setMphone(patients.getPhone());
  149 + babyModel.setMbirth(patients.getBirth());
  150 + //父亲信息
  151 + babyModel.setFjob(patients.getHworkUnit());
  152 + babyModel.setFname(patients.getHusbandName());
  153 + babyModel.setFphone(patients.getHusbandPhone());
  154 + babyModel.setFproTypeId(patients.getHprofessionTypeId());
  155 + babyModel.setfLevelId(patients.getHlevelTypeId());
  156 + babyModel.setFcertNo(patients.getHcertificateNum());
  157 + babyModel.setFcertTypeId(patients.getPcerteTypeId());
  158 + babyModel.setDeliverOrg(patients.getDeliverOrg());
  159 + babyModel.setHospitalId(patients.getHospitalId());
  160 + babyModel.setDueDate(patients.getDueDate());
  161 + babyModel.setDueType(patients.getDueType());
  162 + }
  163 +
  164 + //没有父亲生日
  165 +// babyModel.setFbirth(patients.geth);
148 166 return babyModel;
149 167 }
150 168 /**
151 169  
152 170  
153 171  
154 172  
... ... @@ -158,19 +176,23 @@
158 176 * @param parentId
159 177 * @param userName
160 178 */
161   - private void handBaby(MatDeliverAddRequest deliverAddRequest, List<MaternalDeliverModel.Baby> babyList, MaternalDeliverModel maternalDeliverModel, List<MatDeliverAddRequest.Baby> list, List<String> babyIds, String parentId, String userName) {
  179 + private void handBaby(MatDeliverAddRequest deliverAddRequest, List<MaternalDeliverModel.Baby> babyList, MaternalDeliverModel maternalDeliverModel, List<MatDeliverAddRequest.Baby> list, List<String> babyIds, String parentId, String userName,Patients patients) {
162 180 for (MatDeliverAddRequest.Baby baby : list) {
163 181 MaternalDeliverModel.Baby baby1 = baby.convertToDataModel();
164 182 babyList.add(baby1);
165   - BabyModel babyModel = new BabyModel();
  183 + //填充小孩基本信息
  184 + BabyModel babyModel = fillBaby(patients);
  185 +
166 186 baby.setId(baby1.getId());
167   - babyModel.setBirth(new Date());
  187 + babyModel.setBirth(DateUtil.parseYMD(deliverAddRequest.getDueDate()));
168 188 babyModel.setYn(YnEnums.YES.getId());
169 189 babyModel.setVisitstatus(VisitStatusEnums.UNVISIT.getId());
170 190 babyModel.setAsphyxiaM(baby1.getAsphyxiaM());
  191 + babyModel.setFetusCount(deliverAddRequest.getTireNumber()+"");
171 192 if (null != baby1.getBabyGender()) {
172 193 babyModel.setSex(Integer.valueOf(baby1.getBabyGender()));
173 194 }
  195 + babyModel.setBuildDate(new Date());
174 196 babyModel.setApgarScore(baby1.getApgarScore());
175 197 babyModel.setModified(new Date());
176 198 babyModel.setBabyHealthy(baby1.getBabyHealthy());