jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 4c5920d5d87c329318efff82f4dc2a9405eca2e3

Authored by liquanyu
2 parents f8dcd71fdf 963650e581
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 4c5920d
... ... @@ -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,34 @@
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 + babyModel.setBuildDoctor("产科病房");
  163 + }
  164 +
  165 + //没有父亲生日
  166 +// babyModel.setFbirth(patients.geth);
148 167 return babyModel;
149 168 }
150 169 /**
151 170  
152 171  
153 172  
154 173  
... ... @@ -158,19 +177,23 @@
158 177 * @param parentId
159 178 * @param userName
160 179 */
161   - private void handBaby(MatDeliverAddRequest deliverAddRequest, List<MaternalDeliverModel.Baby> babyList, MaternalDeliverModel maternalDeliverModel, List<MatDeliverAddRequest.Baby> list, List<String> babyIds, String parentId, String userName) {
  180 + 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 181 for (MatDeliverAddRequest.Baby baby : list) {
163 182 MaternalDeliverModel.Baby baby1 = baby.convertToDataModel();
164 183 babyList.add(baby1);
165   - BabyModel babyModel = new BabyModel();
  184 + //填充小孩基本信息
  185 + BabyModel babyModel = fillBaby(patients);
  186 +
166 187 baby.setId(baby1.getId());
167   - babyModel.setBirth(new Date());
  188 + babyModel.setBirth(DateUtil.parseYMD(deliverAddRequest.getDueDate()));
168 189 babyModel.setYn(YnEnums.YES.getId());
169 190 babyModel.setVisitstatus(VisitStatusEnums.UNVISIT.getId());
170 191 babyModel.setAsphyxiaM(baby1.getAsphyxiaM());
  192 + babyModel.setFetusCount(deliverAddRequest.getTireNumber()+"");
171 193 if (null != baby1.getBabyGender()) {
172 194 babyModel.setSex(Integer.valueOf(baby1.getBabyGender()));
173 195 }
  196 + babyModel.setBuildDate(new Date());
174 197 babyModel.setApgarScore(baby1.getApgarScore());
175 198 babyModel.setModified(new Date());
176 199 babyModel.setBabyHealthy(baby1.getBabyHealthy());