jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c387fb7f3c18d0767c2b4ecd6b968851701650ce

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

产后随访

Showing 5 changed files with 253 additions and 74 deletions

platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java View file @ c387fb7
... ... @@ -5,6 +5,7 @@
5 5 import com.lyms.platform.common.dao.operator.MongoCondition;
6 6 import com.lyms.platform.common.dao.operator.MongoOper;
7 7 import com.lyms.platform.common.dao.operator.MongoQuery;
  8 +import org.apache.commons.collections.CollectionUtils;
8 9 import org.springframework.data.mongodb.core.query.Criteria;
9 10  
10 11 import java.util.Date;
11 12  
12 13  
... ... @@ -33,12 +34,71 @@
33 34  
34 35 private String deliveryModeQueryJson;
35 36 private String fmHospital;
  37 + private List<String> fmHospitalList;
  38 + /**
  39 + * 预约联系结果（1-成功、2-失败）
  40 + */
  41 + private Integer contactResult;
36 42  
37 43 /**
  44 + * 预约失败理由（1-无人接听电话、2-拒绝访视、3-其他）
  45 + */
  46 + private Integer contactReason;
  47 +
  48 + /**
  49 + * 访视结果（1-成功、2-失败）
  50 + */
  51 + private Integer visitResult;
  52 + /**
  53 + * 产妇随访确认（1-待确认、2-已确认）
  54 + */
  55 + private Integer visitAffirm;
  56 +
  57 + /**
38 58 * 最后一次随访id
39 59 */
40 60 private String matFollowId;
41 61  
  62 + public Integer getContactResult() {
  63 + return contactResult;
  64 + }
  65 +
  66 + public void setContactResult(Integer contactResult) {
  67 + this.contactResult = contactResult;
  68 + }
  69 +
  70 + public Integer getContactReason() {
  71 + return contactReason;
  72 + }
  73 +
  74 + public void setContactReason(Integer contactReason) {
  75 + this.contactReason = contactReason;
  76 + }
  77 +
  78 + public Integer getVisitResult() {
  79 + return visitResult;
  80 + }
  81 +
  82 + public void setVisitResult(Integer visitResult) {
  83 + this.visitResult = visitResult;
  84 + }
  85 +
  86 + public Integer getVisitAffirm() {
  87 + return visitAffirm;
  88 + }
  89 +
  90 + public void setVisitAffirm(Integer visitAffirm) {
  91 + this.visitAffirm = visitAffirm;
  92 + }
  93 +
  94 + public List<String> getFmHospitalList() {
  95 + return fmHospitalList;
  96 + }
  97 +
  98 + public void setFmHospitalList(List<String> fmHospitalList) {
  99 + this.fmHospitalList = fmHospitalList;
  100 + }
  101 +
42 102 public String getMatFollowId() {
43 103 return matFollowId;
44 104 }
... ... @@ -151,6 +211,25 @@
151 211 if (null != hospitalId) {
152 212 condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
153 213 }
  214 + if (null != contactResult) {
  215 + condition = condition.and("contactResult", contactResult, MongoOper.IS);
  216 + }
  217 + if (null != contactReason) {
  218 + condition = condition.and("contactReason", contactReason, MongoOper.IS);
  219 + }
  220 + if (null != visitResult) {
  221 + condition = condition.and("visitResult", visitResult, MongoOper.IS);
  222 + }
  223 + if (null != visitAffirm) {
  224 + condition = condition.and("visitAffirm", visitAffirm, MongoOper.IS);
  225 + }
  226 + if (null != matFollowId) {
  227 + condition = condition.and("matFollowId", matFollowId, MongoOper.IS);
  228 + }
  229 + if (CollectionUtils.isNotEmpty(fmHospitalList)) {
  230 + condition = condition.and("fmHospital", fmHospitalList, MongoOper.IN);
  231 + }
  232 +
154 233 if (null != fmHospital) {
155 234 condition = condition.and("fmHospital", fmHospital, MongoOper.IS);
156 235 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ c387fb7
... ... @@ -1122,53 +1122,51 @@
1122 1122 /**
1123 1123 * 分娩后随访列表数据
1124 1124 *
1125   - * @param MatdeliverFollowRequest
  1125 + * @param matdeliverFollowRequest
1126 1126 * @return
1127 1127 */
1128   - public BaseListResponse postpartumDeliver(MatdeliverFollowRequest MatdeliverFollowRequest) {
  1128 + public BaseListResponse postpartumDeliver(MatdeliverFollowRequest matdeliverFollowRequest) {
1129 1129 BaseListResponse listResponse = new BaseListResponse();
1130 1130  
1131 1131 List<MatdeliverFollowListResult> matdeliverFollowListResults = new ArrayList<>();
1132 1132  
1133   - PatientsQuery patientsQuery = new PatientsQuery();
1134   -
1135   - if (StringUtils.isNotEmpty(MatdeliverFollowRequest.getBirthDate())) {
1136   - patientsQuery.setFmDateStart(DateUtil.getSNDate(MatdeliverFollowRequest.getBirthDate())[0]);
1137   - patientsQuery.setFmDateEnd(DateUtil.getSNDate(MatdeliverFollowRequest.getBirthDate())[1]);
1138   - }
1139   - patientsQuery.setYn(YnEnums.YES.getId());
1140   - patientsQuery.setIsAutoFm(YnEnums.NO.getId());
1141   - patientsQuery.setType(3);
1142 1133 // 构造医院id集合
1143 1134 List<String> hospitalList = new ArrayList<>();
1144   - if (StringUtils.isEmpty(MatdeliverFollowRequest.getIsArea())) {
1145   - // 非区域
1146   - hospitalList.add(MatdeliverFollowRequest.getHospitalId());
  1135 + //传入了具体的医院id
  1136 + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalId())) {
  1137 + hospitalList.add(matdeliverFollowRequest.getHospitalId());
1147 1138 } else {
  1139 + // 未传入查询条件,进行院内系统进行查询
  1140 + if (StringUtils.isEmpty(matdeliverFollowRequest.getHospitalProvinceId()) && StringUtils.isEmpty(matdeliverFollowRequest.getHospitalCityId()) && StringUtils.isEmpty(matdeliverFollowRequest.getHospitalAreaId())) {
1148 1141  
1149   - if (StringUtils.isNotEmpty(MatdeliverFollowRequest.getHospitalId())) {
1150   - hospitalList.add(MatdeliverFollowRequest.getHospitalId());
1151   - }
  1142 + //根据用户id获取医院ID
  1143 + String hospitalId = autoMatchFacade.getHospitalId(matdeliverFollowRequest.getOperatorId());
  1144 + //默认添加当前医院
  1145 + hospitalList.add(hospitalId);
1152 1146  
1153   - // 未传入查询条件,进行院内系统进行查询
1154   - if (StringUtils.isEmpty(MatdeliverFollowRequest.getHospitalProvinceId()) && StringUtils.isEmpty(MatdeliverFollowRequest.getHospitalCityId()) && StringUtils.isEmpty(MatdeliverFollowRequest.getHospitalAreaId())) {
1155 1147 DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
1156   - dataPermissionsModelQuery.setUserId(MatdeliverFollowRequest.getOperatorId());
  1148 + dataPermissionsModelQuery.setUserId(matdeliverFollowRequest.getOperatorId());
1157 1149 List<DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery);
1158 1150 if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) {
1159 1151 Map data = dataPermissionsModelList.get(0).getData();
1160   - for (Object hospitalId : data.keySet()) {
1161   - if (StringUtils.isNotEmpty(hospitalId.toString()) && !hospitalList.contains(hospitalId.toString())) {
1162   - hospitalList.add(hospitalId.toString());
  1152 + for (Object hosId : data.keySet()) {
  1153 + if (StringUtils.isNotEmpty(hosId.toString()) && !hospitalList.contains(hosId.toString())) {
  1154 + hospitalList.add(hosId.toString());
1163 1155 }
1164 1156 }
1165 1157 }
1166 1158 } else {
1167 1159 // 传入了查询条件
1168 1160 OrganizationQuery organizationQuery = new OrganizationQuery();
1169   - organizationQuery.setProvinceId(MatdeliverFollowRequest.getHospitalProvinceId());
1170   - organizationQuery.setCityId(MatdeliverFollowRequest.getHospitalCityId());
1171   - organizationQuery.setAreaId(MatdeliverFollowRequest.getHospitalAreaId());
  1161 + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalProvinceId())) {
  1162 + organizationQuery.setProvinceId(matdeliverFollowRequest.getHospitalProvinceId());
  1163 + }
  1164 + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalCityId())) {
  1165 + organizationQuery.setCityId(matdeliverFollowRequest.getHospitalCityId());
  1166 + }
  1167 + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getHospitalAreaId())) {
  1168 + organizationQuery.setAreaId(matdeliverFollowRequest.getHospitalAreaId());
  1169 + }
1172 1170 organizationQuery.setYn(YnEnums.YES.getId());
1173 1171 List<Organization> organizationList = organizationService.queryHospitals(organizationQuery);
1174 1172 if (CollectionUtils.isNotEmpty(organizationList)) {
1175 1173  
1176 1174  
... ... @@ -1178,19 +1176,70 @@
1178 1176 }
1179 1177 }
1180 1178 }
1181   - patientsQuery.setFmHospitalQueryList(hospitalList);
1182   - patientsQuery.setLimit(MatdeliverFollowRequest.getLimit());
1183   - patientsQuery.setPage(MatdeliverFollowRequest.getPage());
1184   - patientsQuery.setNeed("need");
1185   - patientsQuery.setDesc("fmDate");
1186   - patientsQuery.setSort("fmDate");
1187 1179  
1188   - List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
1189   - List<String> parentIdList = new ArrayList<>();
1190   - if (CollectionUtils.isEmpty(patientsList)) {
  1180 + if(CollectionUtils.isEmpty(hospitalList)){
1191 1181 // 没有查到，直接抛出
1192 1182 return listResponse;
1193 1183 }
  1184 +
  1185 + MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
  1186 +
  1187 + //查询号不为空，则查询孕妇id
  1188 + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getQueryNo())) {
  1189 + PatientsQuery patientsQuery = new PatientsQuery();
  1190 + patientsQuery.setQueryNo(matdeliverFollowRequest.getQueryNo());
  1191 + patientsQuery.setYn(YnEnums.YES.getId());
  1192 + patientsQuery.setIsAutoFm(YnEnums.NO.getId());
  1193 + patientsQuery.setType(3);
  1194 + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getBirthDate())) {
  1195 + patientsQuery.setFmDateStart(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[0]);
  1196 + patientsQuery.setFmDateEnd(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[1]);
  1197 + }
  1198 + patientsQuery.setFmHospitalQueryList(hospitalList);
  1199 +
  1200 + List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
  1201 + if (CollectionUtils.isEmpty(patientsList)) {
  1202 + // 没有查到，直接抛出
  1203 + return listResponse;
  1204 + }
  1205 + List<String> parentIdList = new ArrayList<>();
  1206 + for (Patients patients : patientsList) {
  1207 + parentIdList.add(patients.getId());
  1208 + }
  1209 + matDeliverQuery.setParentIdList(parentIdList);
  1210 + }
  1211 +
  1212 + matDeliverQuery.setYn(YnEnums.YES.getId());
  1213 + if (StringUtils.isNotEmpty(matdeliverFollowRequest.getBirthDate())) {
  1214 + matDeliverQuery.setCreatedStart(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[0]);
  1215 + matDeliverQuery.setEndStart(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[1]);
  1216 + }
  1217 + matDeliverQuery.setFmHospitalList(hospitalList);
  1218 + matDeliverQuery.setContactResult(matdeliverFollowRequest.getContactResult());
  1219 + if (matdeliverFollowRequest.getContactReason() != null) {
  1220 + matDeliverQuery.setContactResult(PostpartumFollowMakeEnums.ResultEnum.SB.getId());
  1221 + matDeliverQuery.setContactReason(matdeliverFollowRequest.getContactReason());
  1222 + }
  1223 +
  1224 + matDeliverQuery.setVisitResult(matdeliverFollowRequest.getVisitResult());
  1225 + matDeliverQuery.setVisitAffirm(matdeliverFollowRequest.getVisitAffirm());
  1226 + matDeliverQuery.setLimit(matdeliverFollowRequest.getLimit());
  1227 + matDeliverQuery.setPage(matdeliverFollowRequest.getPage());
  1228 + matDeliverQuery.setNeed("need");
  1229 +
  1230 + List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
  1231 + if(CollectionUtils.isEmpty(maternalDeliverModelList)){
  1232 + // 没有查到，直接抛出
  1233 + return listResponse;
  1234 + }
  1235 +
  1236 + PatientsQuery patientsQuery = new PatientsQuery();
  1237 + List<String> parentIdList = new ArrayList<>();
  1238 + for (MaternalDeliverModel md : maternalDeliverModelList) {
  1239 + parentIdList.add(md.getParentId());
  1240 + }
  1241 + patientsQuery.setIds(parentIdList);
  1242 + List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
1194 1243 Map<String, MatdeliverFollowListResult> patientsMap = new HashMap<>();
1195 1244 for (Patients patients : patientsList) {
1196 1245 parentIdList.add(patients.getId());
1197 1246  
1198 1247  
... ... @@ -1211,17 +1260,16 @@
1211 1260 patientsMap.put(patients.getId(), matdeliverFollowListResult);
1212 1261 }
1213 1262  
1214   - MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
1215   - matDeliverQuery.setParentIdList(parentIdList);
1216   - matDeliverQuery.setYn(YnEnums.YES.getId());
1217   - List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
1218 1263  
1219 1264 for (MaternalDeliverModel deliverModel : maternalDeliverModelList) {
1220 1265 MatdeliverFollowListResult matdeliverFollowListResult = patientsMap.get(deliverModel.getParentId());
1221 1266  
  1267 + if(matdeliverFollowListResult == null){
  1268 + continue;
  1269 + }
1222 1270 //最后一次随访Id
1223 1271 matdeliverFollowListResult.setMatFollowId(deliverModel.getMatFollowId());
1224   -
  1272 + matdeliverFollowListResult.setDueDate(deliverModel.getDueDate());
1225 1273 matdeliverFollowListResult.setId(deliverModel.getId());
1226 1274 //机构信息
1227 1275 Organization organization = organizationService.getOrganization(Integer.valueOf(deliverModel.getFmHospital()));
1228 1276  
... ... @@ -1237,9 +1285,10 @@
1237 1285 }
1238 1286 //分娩医院
1239 1287 matdeliverFollowListResult.setFmHospital(organization.getName());
  1288 + matdeliverFollowListResult.setContactResult(deliverModel.getContactResult());
1240 1289 //预约联系结果
1241 1290 if (deliverModel.getContactResult() != null) {
1242   - matdeliverFollowListResult.setContactResult(PostpartumFollowMakeEnums.ResultEnum.getTitle(deliverModel.getContactResult()));
  1291 + matdeliverFollowListResult.setContactResultStr(PostpartumFollowMakeEnums.ResultEnum.getTitle(deliverModel.getContactResult()));
1243 1292 }
1244 1293 //产妇确认结果
1245 1294 if (deliverModel.getVisitAffirm() != null) {
1246 1295  
1247 1296  
1248 1297  
1249 1298  
1250 1299  
1251 1300  
... ... @@ -1251,28 +1300,28 @@
1251 1300 matdeliverFollowListResult.setMakeType(PostpartumFollowMakeEnums.TypeEnum.getTitle(deliverModel.getMakeType()));
1252 1301 }
1253 1302  
  1303 + matdeliverFollowListResult.setIsClose(deliverModel.getIsClose());
1254 1304 //访视是否结案,如果已经结案则返回已结案，如果未结案，显示下次访视时间
1255 1305 if (deliverModel.getIsClose() != null && deliverModel.getIsClose() == PostpartumFollowMakeEnums.IsCloseEnum.YJA.getId()) {
1256 1306 matdeliverFollowListResult.setNextVisitDate(PostpartumFollowMakeEnums.IsCloseEnum.getTitle(deliverModel.getIsClose()));
1257   - } else {
  1307 + } else if (deliverModel.getIsClose() != null && deliverModel.getIsClose() == PostpartumFollowMakeEnums.IsCloseEnum.WJA.getId()) {
1258 1308 //下次访视时间
1259   - if (deliverModel.getNextVisitDate() != null) {
  1309 + if (deliverModel.getNextVisitDate() != null&&deliverModel.getVisitResult()==1) {
1260 1310 matdeliverFollowListResult.setNextVisitDate(DateUtil.getyyyy_MM_dd(deliverModel.getNextVisitDate()));
1261 1311 }
1262 1312 }
1263   - //访视状态
  1313 + //访视状态 0--是修改后替换的初始值
1264 1314 if (deliverModel.getVisitStatus() != null && deliverModel.getVisitStatus() == 1) {
1265 1315 matdeliverFollowListResult.setVisitResult("待访视");
1266 1316 }
1267 1317 //访视结果
1268   - if (deliverModel.getVisitResult() != null) {
  1318 + if (deliverModel.getVisitResult() != null&&deliverModel.getVisitResult() != 0) {
1269 1319 matdeliverFollowListResult.setVisitResult(PostpartumFollowMakeEnums.ResultEnum.getTitle(deliverModel.getVisitResult()));
1270 1320 }
1271 1321  
1272   -
1273 1322 matdeliverFollowListResults.add(matdeliverFollowListResult);
1274 1323 }
1275   - listResponse.setPageInfo(patientsQuery.getPageInfo());
  1324 + listResponse.setPageInfo(matDeliverQuery.getPageInfo());
1276 1325 listResponse.setObject(matdeliverFollowListResults);
1277 1326 return listResponse;
1278 1327 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java View file @ c387fb7
... ... @@ -158,18 +158,7 @@
158 158  
159 159 //如果修改的是最后一次随访记录，则进行同步修改分娩记录里的随访信息
160 160 if (matDeliverFollowAddRequest.getId().equals(maternalDeliverModel.getMatFollowId())) {
161   -
162   - //在分娩记录上记录随访部分信息
163   - maternalDeliverModel.setContactResult(matDeliverFollowAddRequest.getContactResult());
164   - maternalDeliverModel.setContactReason(matDeliverFollowAddRequest.getContactReason());
165   - maternalDeliverModel.setVisitAffirm(matDeliverFollowAddRequest.getVisitAffirm());
166   - maternalDeliverModel.setVisitStatus(matDeliverFollowAddRequest.getVisitStatus());
167   - maternalDeliverModel.setMakeType(matDeliverFollowAddRequest.getMakeType());
168   - maternalDeliverModel.setVisitResult(matDeliverFollowAddRequest.getVisitResult());
169   - maternalDeliverModel.setNextVisitDate(matDeliverFollowAddRequest.getNextVisitDateStr());
170   - maternalDeliverModel.setIsClose(matDeliverFollowAddRequest.getIsClose());
171   - //修改分娩记录
172   - matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
  161 + updateMaternalDeliver(matDeliverFollowAddRequest,maternalDeliverModel);
173 162 baseResponse.setObject(matDeliverFollowAddRequest.getId());
174 163 }
175 164 } else {//新增随访记录，并同步更新分娩记录里的随访信息
... ... @@ -185,16 +174,7 @@
185 174 if (maternalDeliverModel != null) {
186 175 //在分娩记录上记录随访部分信息
187 176 maternalDeliverModel.setMatFollowId(matdeliverFollowModel.getId());
188   - maternalDeliverModel.setContactResult(matdeliverFollowModel.getContactResult());
189   - maternalDeliverModel.setContactReason(matdeliverFollowModel.getContactReason());
190   - maternalDeliverModel.setVisitAffirm(matdeliverFollowModel.getVisitAffirm());
191   - maternalDeliverModel.setVisitStatus(matdeliverFollowModel.getVisitStatus());
192   - maternalDeliverModel.setMakeType(matdeliverFollowModel.getMakeType());
193   - maternalDeliverModel.setVisitResult(matdeliverFollowModel.getVisitResult());
194   - maternalDeliverModel.setNextVisitDate(matdeliverFollowModel.getNextVisitDate());
195   - maternalDeliverModel.setIsClose(matdeliverFollowModel.getIsClose());
196   - //修改分娩记录
197   - matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
  177 + updateMaternalDeliver(matDeliverFollowAddRequest,maternalDeliverModel);
198 178 }else{
199 179 log.error("分娩记录随访没有找到随访记录，传入随访id："+matDeliverFollowAddRequest.getDeliverId());
200 180 }
... ... @@ -204,6 +184,50 @@
204 184 baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
205 185 baseResponse.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
206 186 return baseResponse;
  187 + }
  188 +
  189 +
  190 + private void updateMaternalDeliver(MatDeliverFollowAddRequest matDeliverFollowAddRequest,MaternalDeliverModel maternalDeliverModel){
  191 + //在分娩记录上记录随访部分信息
  192 + maternalDeliverModel.setContactResult(matDeliverFollowAddRequest.getContactResult());
  193 + if(matDeliverFollowAddRequest.getContactReason()!=null){
  194 + maternalDeliverModel.setContactReason(matDeliverFollowAddRequest.getContactReason());
  195 + }else{
  196 + maternalDeliverModel.setContactReason(0);
  197 + }
  198 + if(matDeliverFollowAddRequest.getVisitAffirm()!=null){
  199 + maternalDeliverModel.setVisitAffirm(matDeliverFollowAddRequest.getVisitAffirm());
  200 + }else{
  201 + maternalDeliverModel.setVisitAffirm(0);
  202 + }
  203 + if(matDeliverFollowAddRequest.getVisitStatus()!=null){
  204 + maternalDeliverModel.setVisitStatus(matDeliverFollowAddRequest.getVisitStatus());
  205 + }else{
  206 + maternalDeliverModel.setVisitStatus(0);
  207 + }
  208 + if(matDeliverFollowAddRequest.getMakeType()!=null){
  209 + maternalDeliverModel.setMakeType(matDeliverFollowAddRequest.getMakeType());
  210 + }else{
  211 + maternalDeliverModel.setMakeType(0);
  212 + }
  213 +
  214 + if(matDeliverFollowAddRequest.getVisitResult()!=null){
  215 + maternalDeliverModel.setVisitResult(matDeliverFollowAddRequest.getVisitResult());
  216 + }else{
  217 + maternalDeliverModel.setVisitResult(0);
  218 + }
  219 + if(matDeliverFollowAddRequest.getNextVisitDateStr()!=null){
  220 + maternalDeliverModel.setNextVisitDate(matDeliverFollowAddRequest.getNextVisitDateStr());
  221 + }else{
  222 + maternalDeliverModel.setNextVisitDate(null);
  223 + }
  224 + if(matDeliverFollowAddRequest.getIsClose()!=null){
  225 + maternalDeliverModel.setIsClose(matDeliverFollowAddRequest.getIsClose());
  226 + }else {
  227 + maternalDeliverModel.setIsClose(0);
  228 + }
  229 + //修改分娩记录
  230 + matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
207 231 }
208 232  
209 233 public BaseResponse getOneMatdeliverFollowMake(String id) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowListResult.java View file @ c387fb7
... ... @@ -14,6 +14,10 @@
14 14 private String patientId;
15 15  
16 16 private String pid;
  17 +
  18 + //分娩时间
  19 + private String dueDate;
  20 +
17 21 /**
18 22 * 最后一次随访id
19 23 */
20 24  
... ... @@ -58,8 +62,14 @@
58 62 /**
59 63 * 预约联系结果（1-成功、2-失败）
60 64 */
61   - private String contactResult;
  65 + private Integer contactResult;
  66 +
62 67 /**
  68 + * 预约联系结果（1-成功、2-失败）
  69 + */
  70 + private String contactResultStr;
  71 +
  72 + /**
63 73 * 产妇随访确认（1-待确认、2-已确认）
64 74 */
65 75 private String visitAffirm;
... ... @@ -81,6 +91,14 @@
81 91 */
82 92 private Integer isClose;
83 93  
  94 + public String getDueDate() {
  95 + return dueDate;
  96 + }
  97 +
  98 + public void setDueDate(String dueDate) {
  99 + this.dueDate = dueDate;
  100 + }
  101 +
84 102 public String getMatFollowId() {
85 103 return matFollowId;
86 104 }
87 105  
88 106  
... ... @@ -193,12 +211,20 @@
193 211 this.postViewDay = postViewDay;
194 212 }
195 213  
196   - public String getContactResult() {
  214 + public Integer getContactResult() {
197 215 return contactResult;
198 216 }
199 217  
200   - public void setContactResult(String contactResult) {
  218 + public void setContactResult(Integer contactResult) {
201 219 this.contactResult = contactResult;
  220 + }
  221 +
  222 + public String getContactResultStr() {
  223 + return contactResultStr;
  224 + }
  225 +
  226 + public void setContactResultStr(String contactResultStr) {
  227 + this.contactResultStr = contactResultStr;
202 228 }
203 229  
204 230 public String getVisitAffirm() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatdeliverFollowResult.java View file @ c387fb7
... ... @@ -151,13 +151,14 @@
151 151 if (matdeliverFollowModel.getMakeVisitDate() != null) {
152 152 makeVisitDateStr = DateUtil.getyyyy_MM_dd(matdeliverFollowModel.getMakeVisitDate());
153 153 }
154   - if (matdeliverFollowModel.getContactReason() != null) {
  154 +
  155 + if (matdeliverFollowModel.getContactReason() != null && getContactResult() == 2) {
155 156 contactReasonStr = PostpartumFollowMakeEnums.ReasonEnum.getTitle(matdeliverFollowModel.getContactReason());
156 157 }
157 158 if (matdeliverFollowModel.getVisitResult() != null) {
158 159 visitResultStr = PostpartumFollowMakeEnums.ResultEnum.getTitle(matdeliverFollowModel.getVisitResult());
159 160 }
160   - if (matdeliverFollowModel.getVisitReason() != null) {
  161 + if (matdeliverFollowModel.getVisitReason() != null&&getVisitResult() == 2) {
161 162 visitReasonStr = PostpartumFollowMakeEnums.ReasonEnum.getTitle(matdeliverFollowModel.getVisitReason());
162 163 }
163 164 if (matdeliverFollowModel.getVisitStatus() != null) {