jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 0a210c1dfeb49b13e938a7bd0667c968056a47fd

Authored by jiangjiazhi
2 parents f35191fe50 23877f5225
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java View file @ 0a210c1
... ... @@ -70,7 +70,7 @@
70 70 */
71 71 @ResponseBody
72 72 @TokenRequired
73   - @RequestMapping(method = RequestMethod.GET)
  73 + @RequestMapping(value = "/mataFollowList", method = RequestMethod.GET)
74 74 public BaseResponse findpostpartumFollowMakeList(String pid, String id, HttpServletRequest request) {
75 75 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
76 76  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java View file @ 0a210c1
... ... @@ -19,6 +19,7 @@
19 19 import com.lyms.platform.pojo.MaternalDeliverModel;
20 20 import com.lyms.platform.query.MatDeliverFollowQuery;
21 21 import org.apache.commons.lang.StringUtils;
  22 +import org.apache.log4j.Logger;
22 23 import org.springframework.beans.factory.annotation.Autowired;
23 24 import org.springframework.stereotype.Component;
24 25  
... ... @@ -31,6 +32,7 @@
31 32 */
32 33 @Component
33 34 public class MatdeliverFollowFacade {
  35 + private Logger log = Logger.getLogger(this.getClass());
34 36 @Autowired
35 37 private MatDeliverFollowService matDeliverFollowService;
36 38 @Autowired
... ... @@ -48,8 +50,8 @@
48 50 Map map = new HashMap();
49 51 //是否结案
50 52 map.put("isClose", PostpartumFollowMakeEnums.getIsCloseEnum());
51   - //预约失败理由
52   - map.put("contactReason", PostpartumFollowMakeEnums.getReasonEnum());
  53 + //上门访视失败理由
  54 + map.put("getReason", PostpartumFollowMakeEnums.getReasonEnum());
53 55 //访视结果
54 56 map.put("visitResult", PostpartumFollowMakeEnums.getResultEnum());
55 57 //访视状态（1-待访视、2-已访视）
... ... @@ -59,7 +61,7 @@
59 61 //异常
60 62 map.put("errorType", PostpartumFollowMakeEnums.getErrorTypeEnum());
61 63 //预约失败原因
62   - map.put("contactReasonEnum", PostpartumFollowMakeEnums.getContactReasonEnum());
  64 + map.put("contactReason", PostpartumFollowMakeEnums.getContactReasonEnum());
63 65 //访视确认
64 66 map.put("visitAffirm", PostpartumFollowMakeEnums.getVisitAffirmEnum());
65 67  
... ... @@ -72,7 +74,7 @@
72 74 // String hospitalId = autoMatchFacade.getHospitalId(userId);
73 75 //分娩记录
74 76 MaternalDeliverModel maternalDeliverModel = matDeliverService.getOneMatDeliver(id);
75   - List<Map<String,String>> resutList = new ArrayList<>();
  77 + List<Map<String, String>> resutList = new ArrayList<>();
76 78  
77 79 if (maternalDeliverModel != null) {
78 80 Map<String, String> map = new HashMap<>();
79 81  
80 82  
81 83  
82 84  
... ... @@ -84,16 +86,16 @@
84 86 resutList.add(map);
85 87 }
86 88 MatDeliverFollowQuery mfQuery = new MatDeliverFollowQuery();
87   - mfQuery.setPid(pid);
  89 + mfQuery.setDeliverId(id);
88 90 List<MatdeliverFollowModel> maternalDeliverList = matDeliverFollowService.query(mfQuery);
89   - if(CollectionUtils.isNotEmpty(maternalDeliverList)){
90   - for (MatdeliverFollowModel md : maternalDeliverList){
  91 + if (CollectionUtils.isNotEmpty(maternalDeliverList)) {
  92 + for (MatdeliverFollowModel md : maternalDeliverList) {
91 93 Map<String, String> map = new HashMap<>();
92   - map.put("time", DateUtil.getyyyy_MM_dd(md.getVisitCreateDate()));
  94 + map.put("time", DateUtil.getyyyy_MM_dd(md.getVisitCreateDate()==null?md.getUpdateDate():md.getVisitCreateDate()));
93 95 map.put("title", "访视记录");
94   - map.put("id", id);
  96 + map.put("id", md.getId());
95 97 //访视记录类型
96   - map.put("type","2");
  98 + map.put("type", "2");
97 99 resutList.add(map);
98 100 }
99 101 }
100 102  
... ... @@ -105,8 +107,9 @@
105 107  
106 108 /**
107 109 * 分娩随访记录列表
  110 + *
108 111 * @param matdeliverFollowRequest 查询条件
109   - * @param id 当前登录用户id
  112 + * @param id 当前登录用户id
110 113 * @return
111 114 */
112 115 public BaseListResponse getPostpartumFollowMake(MatdeliverFollowRequest matdeliverFollowRequest, Integer id) {
... ... @@ -118,6 +121,7 @@
118 121  
119 122 /**
120 123 * 新增或修改一条访视记录
  124 + *
121 125 * @param matDeliverFollowAddRequest
122 126 * @param userId
123 127 * @return
124 128  
... ... @@ -127,14 +131,14 @@
127 131 matDeliverFollowAddRequest.setUpdateDate(new Date());
128 132 matDeliverFollowAddRequest.setUpdateUser(String.valueOf(userId));
129 133  
130   - if(StringUtils.isNotEmpty(matDeliverFollowAddRequest.getId())){//修改
  134 + if (StringUtils.isNotEmpty(matDeliverFollowAddRequest.getId())) {//修改
131 135 matDeliverFollowService.updateOne(matDeliverFollowAddRequest.convertToDataModel(), matDeliverFollowAddRequest.getId());
132 136  
133 137 //获取分娩记录
134 138 MaternalDeliverModel maternalDeliverModel = matDeliverService.getOneMatDeliver(matDeliverFollowAddRequest.getDeliverId());
135 139  
136 140 //如果修改的是最后一次随访记录，则进行同步修改分娩记录里的随访信息
137   - if(matDeliverFollowAddRequest.getId().equals(maternalDeliverModel.getMatFollowId())){
  141 + if (matDeliverFollowAddRequest.getId().equals(maternalDeliverModel.getMatFollowId())) {
138 142 //获取随访详情
139 143 MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.getOneMatDeliverFollow(matDeliverFollowAddRequest.getId());
140 144  
141 145  
142 146  
143 147  
... ... @@ -149,26 +153,30 @@
149 153 maternalDeliverModel.setNextVisitDate(matdeliverFollowModel.getNextVisitDate());
150 154 maternalDeliverModel.setIsClose(matdeliverFollowModel.getIsClose());
151 155 //修改分娩记录
152   - matDeliverService.updateOne(maternalDeliverModel,maternalDeliverModel.getId());
  156 + matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
153 157 }
154   - }else{//新增随访记录，并同步更新分娩记录里的随访信息
  158 + } else {//新增随访记录，并同步更新分娩记录里的随访信息
155 159 //新增随访记录
156   - MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.addMatDeliverFollow(matDeliverFollowAddRequest.convertToDataModel());
  160 + MatdeliverFollowModel matdeliverFollowModel = matDeliverFollowService.addMatDeliverFollow(matDeliverFollowAddRequest.convertToDataModel());
157 161  
158 162 //获取分娩记录
159 163 MaternalDeliverModel maternalDeliverModel = matDeliverService.getOneMatDeliver(matDeliverFollowAddRequest.getDeliverId());
160   - //在分娩记录上记录随访部分信息
161   - maternalDeliverModel.setMatFollowId(matdeliverFollowModel.getId());
162   - maternalDeliverModel.setContactResult(matdeliverFollowModel.getContactResult());
163   - maternalDeliverModel.setContactReason(matdeliverFollowModel.getContactReason());
164   - maternalDeliverModel.setVisitAffirm(matdeliverFollowModel.getVisitAffirm());
165   - maternalDeliverModel.setVisitStatus(matdeliverFollowModel.getVisitStatus());
166   - maternalDeliverModel.setMakeType(matdeliverFollowModel.getMakeType());
167   - maternalDeliverModel.setVisitResult(matdeliverFollowModel.getVisitResult());
168   - maternalDeliverModel.setNextVisitDate(matdeliverFollowModel.getNextVisitDate());
169   - maternalDeliverModel.setIsClose(matdeliverFollowModel.getIsClose());
170   - //修改分娩记录
171   - matDeliverService.updateOne(maternalDeliverModel,maternalDeliverModel.getId());
  164 + if (maternalDeliverModel != null) {
  165 + //在分娩记录上记录随访部分信息
  166 + maternalDeliverModel.setMatFollowId(matdeliverFollowModel.getId());
  167 + maternalDeliverModel.setContactResult(matdeliverFollowModel.getContactResult());
  168 + maternalDeliverModel.setContactReason(matdeliverFollowModel.getContactReason());
  169 + maternalDeliverModel.setVisitAffirm(matdeliverFollowModel.getVisitAffirm());
  170 + maternalDeliverModel.setVisitStatus(matdeliverFollowModel.getVisitStatus());
  171 + maternalDeliverModel.setMakeType(matdeliverFollowModel.getMakeType());
  172 + maternalDeliverModel.setVisitResult(matdeliverFollowModel.getVisitResult());
  173 + maternalDeliverModel.setNextVisitDate(matdeliverFollowModel.getNextVisitDate());
  174 + maternalDeliverModel.setIsClose(matdeliverFollowModel.getIsClose());
  175 + //修改分娩记录
  176 + matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId());
  177 + }else{
  178 + log.error("分娩记录随访没有找到随访记录，传入随访id："+matDeliverFollowAddRequest.getDeliverId());
  179 + }
172 180 }
173 181 baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
174 182 baseResponse.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
... ... @@ -197,7 +205,7 @@
197 205 */
198 206 public void convertToResult(MatdeliverFollowResult matdeliverFollowResult) {
199 207 //预约操作员
200   - if(StringUtils.isNotEmpty(matdeliverFollowResult.getMakeCreateUser())){
  208 + if (StringUtils.isNotEmpty(matdeliverFollowResult.getMakeCreateUser())) {
201 209 try {
202 210 Users users = usersService.getUsers(Integer.parseInt(matdeliverFollowResult.getMakeCreateUser()));
203 211 if (users != null) {
... ... @@ -208,7 +216,7 @@
208 216 }
209 217 }
210 218 //访视医生
211   - if(StringUtils.isNotEmpty(matdeliverFollowResult.getVisitDoctor())){
  219 + if (StringUtils.isNotEmpty(matdeliverFollowResult.getVisitDoctor())) {
212 220 try {
213 221 Users users = usersService.getUsers(Integer.parseInt(matdeliverFollowResult.getVisitDoctor()));
214 222 if (users != null) {
... ... @@ -220,7 +228,7 @@
220 228 }
221 229  
222 230 //访视医生
223   - if(StringUtils.isNotEmpty(matdeliverFollowResult.getVisitCreateUser())){
  231 + if (StringUtils.isNotEmpty(matdeliverFollowResult.getVisitCreateUser())) {
224 232 try {
225 233 Users users = usersService.getUsers(Integer.parseInt(matdeliverFollowResult.getVisitCreateUser()));
226 234 if (users != null) {
... ... @@ -231,7 +239,7 @@
231 239 }
232 240 }
233 241 //修改人
234   - if(StringUtils.isNotEmpty(matdeliverFollowResult.getUpdateUser())){
  242 + if (StringUtils.isNotEmpty(matdeliverFollowResult.getUpdateUser())) {
235 243 try {
236 244 Users users = usersService.getUsers(Integer.parseInt(matdeliverFollowResult.getUpdateUser()));
237 245 if (users != null) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java View file @ 0a210c1
... ... @@ -91,7 +91,7 @@
91 91 /**
92 92 * 访视备注
93 93 */
94   - private String visitRemark;
  94 + private String visitRemark;
95 95 /**
96 96 * 访视操作员
97 97 */
98 98  
... ... @@ -168,11 +168,8 @@
168 168 * 指导意见
169 169 */
170 170 private String guideSuggest;
  171 +
171 172 /**
172   - * 指导意见其他
173   - */
174   - private String guideOtherDesc;
175   - /**
176 173 * 是否转诊转诊（1-无、2-有）
177 174 */
178 175 private Integer isRefer;
... ... @@ -201,6 +198,7 @@
201 198 @Override
202 199 public MatdeliverFollowModel convertToDataModel() {
203 200 MatdeliverFollowModel matdeliverFollowModel = new MatdeliverFollowModel();
  201 +
204 202 BeanUtils.copyProperties(this,matdeliverFollowModel);
205 203 return matdeliverFollowModel;
206 204 }
... ... @@ -533,14 +531,6 @@
533 531 this.guideSuggest = guideSuggest;
534 532 }
535 533  
536   - public String getGuideOtherDesc() {
537   - return guideOtherDesc;
538   - }
539   -
540   - public void setGuideOtherDesc(String guideOtherDesc) {
541   - this.guideOtherDesc = guideOtherDesc;
542   - }
543   -
544 534 public Integer getIsRefer() {
545 535 return isRefer;
546 536 }
... ... @@ -607,7 +597,6 @@
607 597 ", otherDesc='" + otherDesc + '\'' +
608 598 ", healthType=" + healthType +
609 599 ", guideSuggest='" + guideSuggest + '\'' +
610   - ", guideOtherDesc='" + guideOtherDesc + '\'' +
611 600 ", isRefer=" + isRefer +
612 601 ", referReason='" + referReason + '\'' +
613 602 ", referHospital='" + referHospital + '\'' +