diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java index afd53ad..97b860b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java @@ -70,7 +70,7 @@ public class MatdeliverFollowController extends BaseController { */ @ResponseBody @TokenRequired - @RequestMapping(method = RequestMethod.GET) + @RequestMapping(value = "/mataFollowList", method = RequestMethod.GET) public BaseResponse findpostpartumFollowMakeList(String pid, String id, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java index d92736d..a3296b9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java @@ -19,6 +19,7 @@ import com.lyms.platform.pojo.MatdeliverFollowModel; import com.lyms.platform.pojo.MaternalDeliverModel; import com.lyms.platform.query.MatDeliverFollowQuery; import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -31,6 +32,7 @@ import java.util.*; */ @Component public class MatdeliverFollowFacade { + private Logger log = Logger.getLogger(this.getClass()); @Autowired private MatDeliverFollowService matDeliverFollowService; @Autowired @@ -48,8 +50,8 @@ public class MatdeliverFollowFacade { Map map = new HashMap(); //是否结案 map.put("isClose", PostpartumFollowMakeEnums.getIsCloseEnum()); - //预约失败理由 - map.put("contactReason", PostpartumFollowMakeEnums.getReasonEnum()); + //上门访视失败理由 + map.put("getReason", PostpartumFollowMakeEnums.getReasonEnum()); //访视结果 map.put("visitResult", PostpartumFollowMakeEnums.getResultEnum()); //访视状态（1-待访视、2-已访视） @@ -59,7 +61,7 @@ public class MatdeliverFollowFacade { //异常 map.put("errorType", PostpartumFollowMakeEnums.getErrorTypeEnum()); //预约失败原因 - map.put("contactReasonEnum", PostpartumFollowMakeEnums.getContactReasonEnum()); + map.put("contactReason", PostpartumFollowMakeEnums.getContactReasonEnum()); //访视确认 map.put("visitAffirm", PostpartumFollowMakeEnums.getVisitAffirmEnum()); @@ -72,7 +74,7 @@ public class MatdeliverFollowFacade { // String hospitalId = autoMatchFacade.getHospitalId(userId); //分娩记录 MaternalDeliverModel maternalDeliverModel = matDeliverService.getOneMatDeliver(id); - List> resutList = new ArrayList<>(); + List> resutList = new ArrayList<>(); if (maternalDeliverModel != null) { Map map = new HashMap<>(); @@ -84,16 +86,16 @@ public class MatdeliverFollowFacade { resutList.add(map); } MatDeliverFollowQuery mfQuery = new MatDeliverFollowQuery(); - mfQuery.setPid(pid); + mfQuery.setDeliverId(id); List maternalDeliverList = matDeliverFollowService.query(mfQuery); - if(CollectionUtils.isNotEmpty(maternalDeliverList)){ - for (MatdeliverFollowModel md : maternalDeliverList){ + if (CollectionUtils.isNotEmpty(maternalDeliverList)) { + for (MatdeliverFollowModel md : maternalDeliverList) { Map map = new HashMap<>(); - map.put("time", DateUtil.getyyyy_MM_dd(md.getVisitCreateDate())); + map.put("time", DateUtil.getyyyy_MM_dd(md.getVisitCreateDate()==null?md.getUpdateDate():md.getVisitCreateDate())); map.put("title", "访视记录"); - map.put("id", id); + map.put("id", md.getId()); //访视记录类型 - map.put("type","2"); + map.put("type", "2"); resutList.add(map); } } @@ -105,8 +107,9 @@ public class MatdeliverFollowFacade { /** * 分娩随访记录列表 + * * @param matdeliverFollowRequest 查询条件 - * @param id 当前登录用户id + * @param id 当前登录用户id * @return */ public BaseListResponse getPostpartumFollowMake(MatdeliverFollowRequest matdeliverFollowRequest, Integer id) { @@ -118,6 +121,7 @@ public class MatdeliverFollowFacade { /** * 新增或修改一条访视记录 + * * @param matDeliverFollowAddRequest * @param userId * @return @@ -127,14 +131,14 @@ public class MatdeliverFollowFacade { matDeliverFollowAddRequest.setUpdateDate(new Date()); matDeliverFollowAddRequest.setUpdateUser(String.valueOf(userId)); - if(StringUtils.isNotEmpty(matDeliverFollowAddRequest.getId())){//修改 + if (StringUtils.isNotEmpty(matDeliverFollowAddRequest.getId())) {//修改 matDeliverFollowService.updateOne(matDeliverFollowAddRequest.convertToDataModel(), matDeliverFollowAddRequest.getId()); //获取分娩记录 MaternalDeliverModel maternalDeliverModel = matDeliverService.getOneMatDeliver(matDeliverFollowAddRequest.getDeliverId()); //如果修改的是最后一次随访记录，则进行同步修改分娩记录里的随访信息 - if(matDeliverFollowAddRequest.getId().equals(maternalDeliverModel.getMatFollowId())){ + if (matDeliverFollowAddRequest.getId().equals(maternalDeliverModel.getMatFollowId())) { //获取随访详情 MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.getOneMatDeliverFollow(matDeliverFollowAddRequest.getId()); @@ -149,26 +153,30 @@ public class MatdeliverFollowFacade { maternalDeliverModel.setNextVisitDate(matdeliverFollowModel.getNextVisitDate()); maternalDeliverModel.setIsClose(matdeliverFollowModel.getIsClose()); //修改分娩记录 - matDeliverService.updateOne(maternalDeliverModel,maternalDeliverModel.getId()); + matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId()); } - }else{//新增随访记录，并同步更新分娩记录里的随访信息 + } else {//新增随访记录，并同步更新分娩记录里的随访信息 //新增随访记录 - MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.addMatDeliverFollow(matDeliverFollowAddRequest.convertToDataModel()); + MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.addMatDeliverFollow(matDeliverFollowAddRequest.convertToDataModel()); //获取分娩记录 MaternalDeliverModel maternalDeliverModel = matDeliverService.getOneMatDeliver(matDeliverFollowAddRequest.getDeliverId()); - //在分娩记录上记录随访部分信息 - maternalDeliverModel.setMatFollowId(matdeliverFollowModel.getId()); - maternalDeliverModel.setContactResult(matdeliverFollowModel.getContactResult()); - maternalDeliverModel.setContactReason(matdeliverFollowModel.getContactReason()); - maternalDeliverModel.setVisitAffirm(matdeliverFollowModel.getVisitAffirm()); - maternalDeliverModel.setVisitStatus(matdeliverFollowModel.getVisitStatus()); - maternalDeliverModel.setMakeType(matdeliverFollowModel.getMakeType()); - maternalDeliverModel.setVisitResult(matdeliverFollowModel.getVisitResult()); - maternalDeliverModel.setNextVisitDate(matdeliverFollowModel.getNextVisitDate()); - maternalDeliverModel.setIsClose(matdeliverFollowModel.getIsClose()); - //修改分娩记录 - matDeliverService.updateOne(maternalDeliverModel,maternalDeliverModel.getId()); + if (maternalDeliverModel != null) { + //在分娩记录上记录随访部分信息 + maternalDeliverModel.setMatFollowId(matdeliverFollowModel.getId()); + maternalDeliverModel.setContactResult(matdeliverFollowModel.getContactResult()); + maternalDeliverModel.setContactReason(matdeliverFollowModel.getContactReason()); + maternalDeliverModel.setVisitAffirm(matdeliverFollowModel.getVisitAffirm()); + maternalDeliverModel.setVisitStatus(matdeliverFollowModel.getVisitStatus()); + maternalDeliverModel.setMakeType(matdeliverFollowModel.getMakeType()); + maternalDeliverModel.setVisitResult(matdeliverFollowModel.getVisitResult()); + maternalDeliverModel.setNextVisitDate(matdeliverFollowModel.getNextVisitDate()); + maternalDeliverModel.setIsClose(matdeliverFollowModel.getIsClose()); + //修改分娩记录 + matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId()); + }else{ + log.error("分娩记录随访没有找到随访记录，传入随访id："+matDeliverFollowAddRequest.getDeliverId()); + } } baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS); baseResponse.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); @@ -197,7 +205,7 @@ public class MatdeliverFollowFacade { */ public void convertToResult(MatdeliverFollowResult matdeliverFollowResult) { //预约操作员 - if(StringUtils.isNotEmpty(matdeliverFollowResult.getMakeCreateUser())){ + if (StringUtils.isNotEmpty(matdeliverFollowResult.getMakeCreateUser())) { try { Users users = usersService.getUsers(Integer.parseInt(matdeliverFollowResult.getMakeCreateUser())); if (users != null) { @@ -208,7 +216,7 @@ public class MatdeliverFollowFacade { } } //访视医生 - if(StringUtils.isNotEmpty(matdeliverFollowResult.getVisitDoctor())){ + if (StringUtils.isNotEmpty(matdeliverFollowResult.getVisitDoctor())) { try { Users users = usersService.getUsers(Integer.parseInt(matdeliverFollowResult.getVisitDoctor())); if (users != null) { @@ -220,7 +228,7 @@ public class MatdeliverFollowFacade { } //访视医生 - if(StringUtils.isNotEmpty(matdeliverFollowResult.getVisitCreateUser())){ + if (StringUtils.isNotEmpty(matdeliverFollowResult.getVisitCreateUser())) { try { Users users = usersService.getUsers(Integer.parseInt(matdeliverFollowResult.getVisitCreateUser())); if (users != null) { @@ -231,7 +239,7 @@ public class MatdeliverFollowFacade { } } //修改人 - if(StringUtils.isNotEmpty(matdeliverFollowResult.getUpdateUser())){ + if (StringUtils.isNotEmpty(matdeliverFollowResult.getUpdateUser())) { try { Users users = usersService.getUsers(Integer.parseInt(matdeliverFollowResult.getUpdateUser())); if (users != null) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java index 96d21f5..0ddbfb7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java @@ -91,7 +91,7 @@ public class MatDeliverFollowAddRequest implements IBasicRequestConvert