jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 6859effccf9556dd3f6ea411ab67d0f0b4e0d2df

Authored by yangfei
1 parent a2ffbb73c1
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

产后随访

Showing 3 changed files with 44 additions and 16 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 6859eff
... ... @@ -1121,6 +1121,7 @@
1121 1121  
1122 1122 /**
1123 1123 * 分娩后随访列表数据
  1124 + *
1124 1125 * @param MatdeliverFollowRequest
1125 1126 * @return
1126 1127 */
... ... @@ -1145,7 +1146,7 @@
1145 1146 hospitalList.add(MatdeliverFollowRequest.getHospitalId());
1146 1147 } else {
1147 1148  
1148   - if(StringUtils.isNotEmpty(MatdeliverFollowRequest.getHospitalId())){
  1149 + if (StringUtils.isNotEmpty(MatdeliverFollowRequest.getHospitalId())) {
1149 1150 hospitalList.add(MatdeliverFollowRequest.getHospitalId());
1150 1151 }
1151 1152  
... ... @@ -1190,7 +1191,7 @@
1190 1191 // 没有查到，直接抛出
1191 1192 return listResponse;
1192 1193 }
1193   - Map<String,MatdeliverFollowListResult> patientsMap = new HashMap<>();
  1194 + Map<String, MatdeliverFollowListResult> patientsMap = new HashMap<>();
1194 1195 for (Patients patients : patientsList) {
1195 1196 parentIdList.add(patients.getId());
1196 1197 MatdeliverFollowListResult matdeliverFollowListResult = new MatdeliverFollowListResult();
... ... @@ -1215,7 +1216,7 @@
1215 1216 matDeliverQuery.setYn(YnEnums.YES.getId());
1216 1217 List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
1217 1218  
1218   - for(MaternalDeliverModel deliverModel : maternalDeliverModelList){
  1219 + for (MaternalDeliverModel deliverModel : maternalDeliverModelList) {
1219 1220 MatdeliverFollowListResult matdeliverFollowListResult = patientsMap.get(deliverModel.getParentId());
1220 1221  
1221 1222 //最后一次随访Id
1222 1223  
1223 1224  
1224 1225  
1225 1226  
1226 1227  
1227 1228  
1228 1229  
... ... @@ -1237,30 +1238,38 @@
1237 1238 //分娩医院
1238 1239 matdeliverFollowListResult.setFmHospital(organization.getName());
1239 1240 //预约联系结果
1240   - if(deliverModel.getContactResult()!=null){
  1241 + if (deliverModel.getContactResult() != null) {
1241 1242 matdeliverFollowListResult.setContactResult(PostpartumFollowMakeEnums.ResultEnum.getTitle(deliverModel.getContactResult()));
1242 1243 }
1243 1244 //产妇确认结果
1244   - if(deliverModel.getVisitAffirm()!=null){
  1245 + if (deliverModel.getVisitAffirm() != null) {
1245 1246 matdeliverFollowListResult.setVisitAffirm(PostpartumFollowMakeEnums.VisitAffirmEnum.getTitle(deliverModel.getVisitAffirm()));
1246 1247 }
1247   - //访视结果
1248   - if(deliverModel.getVisitResult()!=null){
1249   - matdeliverFollowListResult.setVisitResult(PostpartumFollowMakeEnums.ResultEnum.getTitle(deliverModel.getVisitResult()));
1250   - }
  1248 +
1251 1249 //访视类型
1252   - if(deliverModel.getMakeType()!=null){
  1250 + if (deliverModel.getMakeType() != null) {
1253 1251 matdeliverFollowListResult.setMakeType(PostpartumFollowMakeEnums.TypeEnum.getTitle(deliverModel.getMakeType()));
1254 1252 }
1255   - //下次访视时间
1256   - if(deliverModel.getNextVisitDate()!=null){
1257   - matdeliverFollowListResult.setNextVisitDate(DateUtil.getyyyy_MM_dd(deliverModel.getNextVisitDate()));
1258   - }
1259 1253  
1260   - //访视是否结案
1261   - if(deliverModel.getIsClose()!=null){
  1254 + //访视是否结案,如果已经结案则返回已结案，如果未结案，显示下次访视时间
  1255 + if (deliverModel.getIsClose() != null && deliverModel.getIsClose() == PostpartumFollowMakeEnums.IsCloseEnum.YJA.getId()) {
1262 1256 matdeliverFollowListResult.setNextVisitDate(PostpartumFollowMakeEnums.IsCloseEnum.getTitle(deliverModel.getIsClose()));
  1257 + } else {
  1258 + //下次访视时间
  1259 + if (deliverModel.getNextVisitDate() != null) {
  1260 + matdeliverFollowListResult.setNextVisitDate(DateUtil.getyyyy_MM_dd(deliverModel.getNextVisitDate()));
  1261 + }
1263 1262 }
  1263 + //访视状态
  1264 + if (deliverModel.getVisitStatus() != null && deliverModel.getVisitStatus() == 1) {
  1265 + matdeliverFollowListResult.setVisitResult("待访视");
  1266 + }
  1267 + //访视结果
  1268 + if (deliverModel.getVisitResult() != null) {
  1269 + matdeliverFollowListResult.setVisitResult(PostpartumFollowMakeEnums.ResultEnum.getTitle(deliverModel.getVisitResult()));
  1270 + }
  1271 +
  1272 +
1264 1273 matdeliverFollowListResults.add(matdeliverFollowListResult);
1265 1274 }
1266 1275 listResponse.setPageInfo(patientsQuery.getPageInfo());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java View file @ 6859eff
... ... @@ -132,7 +132,24 @@
132 132 matDeliverFollowAddRequest.setUpdateDateStr(new Date());
133 133 matDeliverFollowAddRequest.setUpdateUser(String.valueOf(userId));
134 134  
  135 +
  136 + if(matDeliverFollowAddRequest.getVisitResult()!=null&&matDeliverFollowAddRequest.getVisitResult() == 1){//访视成功，默认设置待确认
  137 + //产妇随访确认 为待确认
  138 + matDeliverFollowAddRequest.setVisitAffirm(1);
  139 + }
  140 +
  141 + //预约成功，但访问状态还是null则就是待访视状态
  142 + if(matDeliverFollowAddRequest.getContactResult() == 1&&matDeliverFollowAddRequest.getVisitResult() == null){
  143 + matDeliverFollowAddRequest.setVisitStatus(1);
  144 + }
  145 + //有访视结果时，则就是已访视状态
  146 + if(matDeliverFollowAddRequest.getVisitResult() != null){
  147 + matDeliverFollowAddRequest.setVisitStatus(2);
  148 + }
  149 +
135 150 if (StringUtils.isNotEmpty(matDeliverFollowAddRequest.getId())) {//修改
  151 + matDeliverFollowAddRequest.setMakeCreateUser(null);
  152 + matDeliverFollowAddRequest.setMakeCreateDate(null);
136 153 //修改随访信息
137 154 matDeliverFollowService.updateOne(matDeliverFollowAddRequest.convertToDataModel(), matDeliverFollowAddRequest.getId());
138 155  
... ... @@ -141,6 +158,7 @@
141 158  
142 159 //如果修改的是最后一次随访记录，则进行同步修改分娩记录里的随访信息
143 160 if (matDeliverFollowAddRequest.getId().equals(maternalDeliverModel.getMatFollowId())) {
  161 +
144 162 //在分娩记录上记录随访部分信息
145 163 maternalDeliverModel.setContactResult(matDeliverFollowAddRequest.getContactResult());
146 164 maternalDeliverModel.setContactReason(matDeliverFollowAddRequest.getContactReason());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 6859eff
... ... @@ -2347,6 +2347,7 @@
2347 2347 String loseBloodCause = "";
2348 2348 if (StringUtils.isNotEmpty(data.getLoseBloodCause())) {
2349 2349 String loseBloodCauseJson = data.getLoseBloodCause();
  2350 +
2350 2351 Map<String, String> loseBloodCauseMap = JsonUtil.getMap(loseBloodCauseJson);
2351 2352 if (MapUtils.isNotEmpty(loseBloodCauseMap) && StringUtils.isNotEmpty(loseBloodCauseMap.get("select"))) {
2352 2353 for (SXCauseEnums sxCauseEnums : SXCauseEnums.values()) {