jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8c66ad1908d668db82d79d3f6304da1bc7f74999

Authored by zhangchao
1 parent 7d9bad6af5
Exists in luanping and in 1 other branch dev

#新增秦皇岛二院高危因素检查项配置及产检录入、产检提醒推送等功能

Showing 3 changed files with 411 additions and 166 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FactorProjectController.java View file @ 8c66ad1
  1 +package com.lyms.platform.operate.web.controller;
  2 +
  3 +import com.lyms.platform.common.annotation.TokenRequired;
  4 +import com.lyms.platform.common.base.BaseController;
  5 +import com.lyms.platform.common.constants.ErrorCodeConstants;
  6 +import com.lyms.platform.common.utils.ResultUtils;
  7 +import com.lyms.platform.common.utils.StringUtils;
  8 +import com.lyms.platform.operate.web.facade.BookbuildingFacade;
  9 +import com.lyms.platform.operate.web.result.FrontEndResult;
  10 +import com.lyms.platform.permission.model.FactorProject;
  11 +import com.lyms.platform.permission.model.FactorProjectEntity;
  12 +import com.lyms.platform.permission.model.FactorProjectManage;
  13 +import com.lyms.platform.permission.model.FactorProjectQuery;
  14 +import com.lyms.platform.permission.service.FactorProjectService;
  15 +import org.springframework.beans.factory.annotation.Autowired;
  16 +import org.springframework.beans.factory.annotation.Qualifier;
  17 +import org.springframework.stereotype.Controller;
  18 +import org.springframework.web.bind.annotation.*;
  19 +
  20 +import javax.servlet.http.HttpServletResponse;
  21 +import java.util.Date;
  22 +import java.util.List;
  23 +
  24 +@Controller
  25 +@RequestMapping("/factorProject")
  26 +public class FactorProjectController extends BaseController {
  27 + @Autowired
  28 + @Qualifier("factorProjectService")
  29 + private FactorProjectService factorProjectService;
  30 +
  31 + @RequestMapping(value = "/getList", method = RequestMethod.GET)
  32 + @ResponseBody
  33 + public FrontEndResult getCheckItemManageList(@RequestParam(value = "hospitalId") Integer hospitalId,
  34 + @RequestParam(value = "page", required = false) Integer page,
  35 + @RequestParam(value = "week", required = false) String week,
  36 + @RequestParam(value = "limit", required = false) Integer limit) {
  37 + FactorProjectQuery factorProjectQuery = new FactorProjectQuery();
  38 + factorProjectQuery.setNeed("true");
  39 + factorProjectQuery.setSort("id asc");
  40 + factorProjectQuery.setPage(page);
  41 + factorProjectQuery.setLimit(limit);
  42 + factorProjectQuery.setHospitalId(hospitalId);
  43 + factorProjectQuery.setWeek(week);
  44 +
  45 + List<FactorProject> list = factorProjectService.getList(factorProjectQuery);
  46 +
  47 + FrontEndResult frontEndResult = new FrontEndResult();
  48 + frontEndResult.setPageInfo(factorProjectQuery.getPageInfo());
  49 + frontEndResult.setData(list);
  50 + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
  51 + return frontEndResult;
  52 + }
  53 +
  54 + @RequestMapping(value = "/add", method = RequestMethod.POST)
  55 + @TokenRequired
  56 + public void add(HttpServletResponse response, @RequestBody FactorProject factorProject) {
  57 + if (factorProject.getHospitalId() == null) {
  58 + ResultUtils.buildParameterErrorResultAndWrite(response, "医院ID不能为空");
  59 + }
  60 + factorProject.setCreated(new Date());
  61 + factorProjectService.add(factorProject);
  62 + ResultUtils.buildSuccessResultAndWrite(response);
  63 + }
  64 +
  65 + @RequestMapping(value = "/update", method = RequestMethod.POST)
  66 + //@TokenRequired
  67 + public void update(HttpServletResponse response, @RequestBody FactorProject factorProject) {
  68 + if (factorProject.getId() == null) {
  69 + ResultUtils.buildParameterErrorResultAndWrite(response, "ID不能为空");
  70 + }
  71 + factorProjectService.update(factorProject);
  72 + ResultUtils.buildSuccessResultAndWrite(response);
  73 + }
  74 +
  75 + @RequestMapping(value = "/del", method = RequestMethod.GET)
  76 + @TokenRequired
  77 + public void del(HttpServletResponse response, @RequestParam(value = "id") Integer id) {
  78 + if (id == null) {
  79 + ResultUtils.buildParameterErrorResultAndWrite(response, "ID不能为空");
  80 + }
  81 + FactorProject factorProject= factorProjectService.selectById(id);
  82 + if (factorProject!=null){
  83 + factorProjectService.del(id);
  84 + }
  85 + ResultUtils.buildSuccessResultAndWrite(response);
  86 + }
  87 +
  88 + @Autowired
  89 + private BookbuildingFacade bookbuildingFacade;
  90 +
  91 + @RequestMapping(value = "/selectInfo", method = RequestMethod.GET)
  92 + @TokenRequired
  93 + public void selectInfo(HttpServletResponse response, @RequestParam(value = "id") Integer id) {
  94 + if (id == null) {
  95 + ResultUtils.buildParameterErrorResultAndWrite(response, "ID不能为空");
  96 + }
  97 + FactorProjectManage factorProject= factorProjectService.selectInfo(id);
  98 +
  99 + ResultUtils.buildSuccessResultAndWrite(response,factorProject);
  100 + }
  101 +
  102 + @RequestMapping(value = "/selectByWeek", method = RequestMethod.GET)
  103 + //@TokenRequired
  104 + public void selectInfo(HttpServletResponse response,
  105 + @RequestParam(value = "hospitalId") Integer hospitalId,
  106 + @RequestParam(value = "week") String week) {
  107 + if (hospitalId == null) {
  108 + ResultUtils.buildParameterErrorResultAndWrite(response, "ID不能为空");
  109 + }
  110 + FactorProjectQuery factorProjectQuery=new FactorProjectQuery();
  111 + factorProjectQuery.setHospitalId(hospitalId);
  112 + factorProjectQuery.setWeek(week);
  113 + FactorProjectEntity factorProject= factorProjectService.selectByWeek(factorProjectQuery);
  114 + ResultUtils.buildSuccessResultAndWrite(response,factorProject);
  115 + }
  116 +
  117 +
  118 + @RequestMapping(value = "/test", method = RequestMethod.GET)
  119 + public void test(HttpServletResponse response){
  120 + bookbuildingFacade.bookbuildingSync();
  121 + ResultUtils.buildSuccessResultAndWrite(response);
  122 + }
  123 +}
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ 8c66ad1
Diff suppressed. Click to show
... ... @@ -24,6 +24,7 @@
24 24 import com.lyms.platform.common.utils.*;
25 25 import com.lyms.platform.operate.web.request.*;
26 26 import com.lyms.platform.operate.web.result.*;
  27 +import com.lyms.platform.operate.web.service.IBaseService;
27 28 import com.lyms.platform.operate.web.service.ITrackDownService;
28 29 import com.lyms.platform.operate.web.utils.CommonsHelper;
29 30 import com.lyms.platform.operate.web.utils.JdbcUtil;
30 31  
... ... @@ -32,11 +33,13 @@
32 33 import com.lyms.platform.permission.dao.master.MasterOrganizationMapper;
33 34 import com.lyms.platform.permission.model.*;
34 35 import com.lyms.platform.permission.service.CouponService;
  36 +import com.lyms.platform.permission.service.FactorProjectService;
35 37 import com.lyms.platform.permission.service.OrganizationService;
36 38 import com.lyms.platform.permission.service.UsersService;
37 39 import com.lyms.platform.pojo.*;
38 40 import com.lyms.platform.query.*;
39 41 import org.apache.commons.collections.CollectionUtils;
  42 +import org.apache.commons.lang3.time.DateFormatUtils;
40 43 import org.slf4j.Logger;
41 44 import org.slf4j.LoggerFactory;
42 45 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -208,6 +211,8 @@
208 211 private AuthenticationFacade authenticationFacade;
209 212 @Autowired
210 213 private CommunityConfigService communityConfigService;
  214 + @Autowired
  215 + private FactorProjectService factorProjectService;
211 216  
212 217  
213 218 public static final String syncToV2Url = PropertiesUtils.getPropertyValue("sync_to_v2_url");
214 219  
215 220  
216 221  
... ... @@ -231,24 +236,21 @@
231 236 * @return
232 237 */
233 238 public BaseObjectResponse addPregnantBookbuilding(
234   - YunBookbuildingAddRequest yunRequest, Integer uId, boolean isSync) {
  239 + YunBookbuildingAddRequest yunRequest, Integer uId, boolean isSync) {
235 240 // if (yunRequest.getBooksuifangDoctor()!=null){
236 241 // yunRequest.setBooksuifangDoctor(JSON.toJSONString(yunRequest.getBooksuifangDoctor()));
237 242 // }
238   - if (StringUtils.isNotEmpty(yunRequest.getOrgName()))
239   - {
  243 + if (StringUtils.isNotEmpty(yunRequest.getOrgName())) {
240 244 OrganizationQuery organizationQuery = new OrganizationQuery();
241 245 organizationQuery.setYn(YnEnums.YES.getId());
242 246 organizationQuery.setName(yunRequest.getOrgName());
243 247 List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
244   - if (CollectionUtils.isNotEmpty(organizations))
245   - {
  248 + if (CollectionUtils.isNotEmpty(organizations)) {
246 249 yunRequest.setHospitalId(String.valueOf(organizations.get(0).getId()));
247 250 UsersQuery usersQuery = new UsersQuery();
248 251 usersQuery.setOrgId(organizations.get(0).getId());
249 252 List<Users> users = usersService.queryUsers(usersQuery);
250   - if (CollectionUtils.isNotEmpty(users))
251   - {
  253 + if (CollectionUtils.isNotEmpty(users)) {
252 254 uId = users.get(0).getId();
253 255 }
254 256 }
... ... @@ -386,7 +388,7 @@
386 388 getTrackHospital(patient);
387 389  
388 390 String riskFactorId = yunRequest.getRiskFactorId();
389   - if(org.apache.commons.lang3.StringUtils.isNotEmpty(riskFactorId)){
  391 + if (org.apache.commons.lang3.StringUtils.isNotEmpty(riskFactorId)) {
390 392 patient.setRiskFactorId(Arrays.asList(riskFactorId.split(",")));
391 393 }
392 394 patient.setRiskLevelId(yunRequest.getLevel());
... ... @@ -407,7 +409,7 @@
407 409 operateLogFacade.addAddOptLog(userId, Integer.valueOf(yunRequest.getHospitalId()), null, OptActionEnums.ADD.getId(), "孕妇建档");
408 410 /** 建档核验模块 **/
409 411 //建档成功后保存核验结果
410   - if(StringUtils.isNotEmpty(p.getId()) && null != yunRequest.getVerifyInfo()){
  412 + if (StringUtils.isNotEmpty(p.getId()) && null != yunRequest.getVerifyInfo()) {
411 413 yunRequest.getVerifyInfo().setPid(p.getId());
412 414 yunRequest.getVerifyInfo().setVerifyDate(p.getBookbuildingDate());
413 415 authenticationFacade.addOrUpDate(yunRequest.getVerifyInfo(), userId);
... ... @@ -434,7 +436,6 @@
434 436 }
435 437  
436 438  
437   -
438 439 //加入产筛
439 440 patientsService.validata(p);
440 441  
... ... @@ -520,6 +521,7 @@
520 521 if (tempP.getType() == ServiceObjEnums.YUNOBJ.getId()) {
521 522 //生成建档短信
522 523 createBuildMsg(tempP);
  524 +
523 525 }
524 526 //秦皇岛建档获取分娩信息
525 527 if ("4".equals(HIS_VERSION) && "216".equals(tempP.getHospitalId())) {
... ... @@ -550,7 +552,7 @@
550 552 }
551 553 }
552 554 //自动诊断
553   - antenatalExaminationFacade.autoPatientRisk(tempP,userId);
  555 + antenatalExaminationFacade.autoPatientRisk(tempP, userId);
554 556  
555 557 }
556 558 });
557 559  
558 560  
559 561  
... ... @@ -569,30 +571,23 @@
569 571 return br;
570 572 }
571 573  
572   - private void getTrackHospital(Patients patients)
573   - {
574   - if (CollectionUtils.isNotEmpty(patients.getChildExtAddrs()))
575   - {
  574 + private void getTrackHospital(Patients patients) {
  575 + if (CollectionUtils.isNotEmpty(patients.getChildExtAddrs())) {
576 576 PostVisitHospitalModelQuery postQuery = new PostVisitHospitalModelQuery();
577 577 postQuery.setAreaTiters(patients.getChildExtAddrs());
578 578 List<PostVisitHospitalModel> postVisitHospitalModels = postVisitHospitalService.queryPostVisitHospitalModel(postQuery);
579   - if (CollectionUtils.isNotEmpty(postVisitHospitalModels))
580   - {
581   - System.out.println("setTrackHospitalId==="+postVisitHospitalModels.get(0).getPostHosptial());
  579 + if (CollectionUtils.isNotEmpty(postVisitHospitalModels)) {
  580 + System.out.println("setTrackHospitalId===" + postVisitHospitalModels.get(0).getPostHosptial());
582 581 patients.setTrackHospitalId(postVisitHospitalModels.get(0).getPostHosptial());
583 582 }
584 583 }
585 584 }
586 585  
587 586  
588   - private void getNumberCode(Patients patients)
589   - {
590   - if (patients.getCardNo().length() > 8)
591   - {
  587 + private void getNumberCode(Patients patients) {
  588 + if (patients.getCardNo().length() > 8) {
592 589 patients.setNumberCode(patients.getCardNo().substring(patients.getCardNo().length() - 8));
593   - }
594   - else
595   - {
  590 + } else {
596 591 patients.setNumberCode(patients.getCardNo());
597 592 }
598 593 }
599 594  
600 595  
... ... @@ -1114,16 +1109,13 @@
1114 1109 mr.setObjType(ServiceObjEnums.YUNOBJ.getId());
1115 1110 mr.setPhone(patient.getPhone());
1116 1111  
1117   - if (templateModel.getSendTime() != null && "00:00".equals(templateModel.getSendTime()))
1118   - {
  1112 + if (templateModel.getSendTime() != null && "00:00".equals(templateModel.getSendTime())) {
1119 1113 mr.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
1120 1114 mr.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
1121   - }
1122   - else
1123   - {
  1115 + } else {
1124 1116 mr.setTimeType(SmsTimeTypeEnums.NO_ONTIME.getId());
1125   - String date = DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(),templateModel.getSendTimeType()));
1126   - mr.setPlanTime(date + " " + templateModel.getSendTime() +":00");
  1117 + String date = DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(), templateModel.getSendTimeType()));
  1118 + mr.setPlanTime(date + " " + templateModel.getSendTime() + ":00");
1127 1119 }
1128 1120  
1129 1121  
1130 1122  
1131 1123  
... ... @@ -1152,9 +1144,149 @@
1152 1144 }
1153 1145 }
1154 1146 }
  1147 + //发送产检录入 秦皇岛二院
  1148 + sendbuildingMsg(patient, SmsServiceEnums.FWKT.getId(), "【产检录入提醒】", "亲爱的孕妈妈，请点击小程序录入产检信息", "");
  1149 +
1155 1150 }
1156 1151  
  1152 + private void sendbuildingMsg(Patients patient, Integer subTypeId, String first, String keyWord1, String remark) {
  1153 + if ("1000000016".equals(patient.getHospitalId())) {
  1154 + List<MsgRequest> messages = new ArrayList<>();
  1155 + MsgRequest mr = new MsgRequest();
  1156 + mr.setPhone(patient.getPhone());
  1157 + mr.setTypeId(ProjectTypeEnums.YNXT.getId());
  1158 + mr.setStatus(SmsStatusEnums.WFS.getId());
  1159 + mr.setHospitalId(patient.getHospitalId());
  1160 + mr.setTempId("657ad0e90cf25d442e62df56");
  1161 + mr.setPatientId(patient.getId());
  1162 + mr.setSmsStatus(SmsStatusEnums.WFS.getId());
  1163 + mr.setServiceType(1); //判断发送类型
  1164 + mr.setFirst(first);//
  1165 + mr.setObjType(ServiceObjEnums.YUNOBJ.getId());
  1166 + mr.setSubTypeId(subTypeId);
  1167 + mr.setKeyword1(keyWord1);//
  1168 + String keyWord2 = DateUtil.getyyyy_MM_dd(DateUtil.addDay(DateUtil.getYMDTime(), 1));
  1169 + if (subTypeId != 7) {
  1170 + keyWord2 = DateUtil.getyyyy_MM_dd(new Date());
  1171 + }
  1172 + mr.setKeyword2(keyWord2);
  1173 + mr.setRemark(remark);
  1174 + mr.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
  1175 + mr.setWxTempId(WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId());
  1176 + messages.add(mr);
  1177 + smsConfigFacade.saveMsg(messages, patient.getHospitalId());
  1178 + }
  1179 + }
  1180 +
1157 1181 /**
  1182 + * 秦皇岛二院 产检录入提醒 下午17点推送
  1183 + *
  1184 + * @param
  1185 + */
  1186 + public void bookbuildingSync() {
  1187 + PatientsQuery patientsQuery = new PatientsQuery();
  1188 + patientsQuery.setHospitalId("1000000016");
  1189 + patientsQuery.setExtEnable(false);
  1190 + patientsQuery.setBuildTypeNot(1);
  1191 + patientsQuery.setYn(YnEnums.YES.getId());
  1192 + patientsQuery.setIsNextCheckTime(DateUtil.getYMDTime());
  1193 + // patientsQuery.setIsNextCheckTime(DateUtil.addDay(DateUtil.getYMDTime(), 0));
  1194 + final List<Patients> patientList = patientsService.queryPatient(patientsQuery);
  1195 + if (CollectionUtils.isNotEmpty(patientList)) {
  1196 + new Thread(new Runnable() {
  1197 + @Override
  1198 + public void run() {
  1199 + for (int i = 0, j = patientList.size(); i < j; i++) {
  1200 + Patients patients = patientList.get(i);
  1201 + sendbuildingMsg(patients, SmsServiceEnums.FWKT.getId(), "【产检录入提醒】", "亲爱的孕妈妈，请点击小程序录入产检信息", "");
  1202 + }
  1203 + }
  1204 + }).start();
  1205 + }
  1206 + }
  1207 +
  1208 + /**
  1209 + * 秦皇岛二院产检提醒 上午9点推送
  1210 + */
  1211 + public void weekSync() {
  1212 + logger.info("weekSync startup");
  1213 + final String hospitalId = "1000000016";
  1214 + PatientsQuery patientsQuery = new PatientsQuery();
  1215 + patientsQuery.setHospitalId(hospitalId);
  1216 + patientsQuery.setExtEnable(false);
  1217 + patientsQuery.setBuildTypeNot(1);
  1218 + patientsQuery.setYn(YnEnums.YES.getId());
  1219 +
  1220 + Date time = DateUtil.addDay(DateUtil.getYMDTime(), 1);
  1221 + String str = DateUtil.getyyyy_MM_dd(time);
  1222 + patientsQuery.setIsNextCheckTime(DateUtil.parseYMD(str));
  1223 + final List<Patients> patientList = patientsService.queryPatient(patientsQuery);
  1224 + if (CollectionUtils.isNotEmpty(patientList)) {
  1225 + logger.info("weekSync Threading");
  1226 + new Thread(new Runnable() {
  1227 + @Override
  1228 + public void run() {
  1229 + for (int i = 0, j = patientList.size(); i < j; i++) {
  1230 + Patients patients = patientList.get(i);
  1231 + String week = getBuildingWeek(patients);
  1232 + sendbuildingMsg(patients, SmsServiceEnums.CJYYTX.getId(), "【产检提醒】", "亲爱的孕妈妈，您当前孕周为" + week + ",请点击此处查看就诊流程。", week);
  1233 +
  1234 + if (CollectionUtils.isNotEmpty(patients.getRiskFactorId()) && !patients.getRiskFactorId().contains("d42eec03-aa86-45b8-a4e0-78a0ff365fb6")) {
  1235 + //TODO 处理高危和健康跳转的页面逻辑 push_center
  1236 + try {
  1237 + FactorProjectQuery factorProjectQuery = new FactorProjectQuery();
  1238 + factorProjectQuery.setHospitalId(Integer.valueOf(hospitalId));
  1239 + factorProjectQuery.setWeek(week);
  1240 + factorProjectQuery.setRiskFactorIds(patients.getRiskFactorId());
  1241 + List<FactorProject> projectList = factorProjectService.getList(factorProjectQuery);
  1242 + if (CollectionUtils.isNotEmpty(projectList)) {
  1243 + logger.info("FactorProject is not null");
  1244 + Thread.sleep(3000);
  1245 + sendbuildingMsg(patients, SmsServiceEnums.CJYYTX.getId(), "【产检提醒】", "您当前有高危因素，请点击查看具体产检流程", week);
  1246 +
  1247 + }
  1248 + } catch (InterruptedException e) {
  1249 + logger.error("weekSync InterruptedException," + e.getMessage());
  1250 + }
  1251 + }
  1252 + }
  1253 + }
  1254 + }).start();
  1255 + }
  1256 + logger.info("weekSync end");
  1257 + }
  1258 +
  1259 +
  1260 + /**
  1261 + * 查询孕期
  1262 + *
  1263 + * @param patients
  1264 + * @return
  1265 + */
  1266 + private String getBuildingWeek(Patients patients) {
  1267 + String dueWeek = "";
  1268 + try {
  1269 + // 徐倩说改的
  1270 + if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) {
  1271 +// if (patients.getBookbuildingDate().getTime() - patients.getFmDate().getTime() > 0 && patients.getBuildType() == 2) {
  1272 + dueWeek = "已分娩";
  1273 + } else {
  1274 + int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate());
  1275 + if (days > 7 * 42 - 1) {
  1276 + dueWeek = "已分娩";
  1277 + } else {
  1278 + String week = (days / 7) + "";
  1279 + int day = (days % 7);
  1280 + dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
  1281 + }
  1282 + }
  1283 + } catch (Exception e) {
  1284 + // 什么都不干
  1285 + }
  1286 + return dueWeek;
  1287 + }
  1288 +
  1289 + /**
1158 1290 * 更新孕妇服务相关信息
1159 1291 *
1160 1292 * @param id
... ... @@ -1289,7 +1421,7 @@
1289 1421  
1290 1422 /** 建档核验模块 **/
1291 1423 //建档修改成功后添加或修改核验结果
1292   - if(null != yunRequest.getVerifyInfo() && StringUtils.isNotEmpty(id)){
  1424 + if (null != yunRequest.getVerifyInfo() && StringUtils.isNotEmpty(id)) {
1293 1425 authenticationFacade.addOrUpDate(yunRequest.getVerifyInfo(), userId);
1294 1426 }
1295 1427 /**------------**/
1296 1428  
1297 1429  
1298 1430  
... ... @@ -1341,16 +1473,16 @@
1341 1473 * @Author: 武涛涛
1342 1474 * @Date: 2020/11/25 14:04
1343 1475 */
1344   - private void puerperaConvertPregnant (String id, YunBookbuildingAddRequest yunRequest, Patients patient, Patients beforePatient){
  1476 + private void puerperaConvertPregnant(String id, YunBookbuildingAddRequest yunRequest, Patients patient, Patients beforePatient) {
1345 1477 try {
1346 1478 Date lastMenses = patient.getLastMenses();
1347   - Date endDate = DateUtil.addDay(new Date(), -294);
  1479 + Date endDate = DateUtil.addDay(new Date(), -294);
1348 1480 int i = lastMenses.compareTo(endDate);
1349 1481  
1350 1482 //判断为自动分娩产妇（buildType 2 自动分娩类型）,手动分娩的不做处理
1351   - if(beforePatient!=null && beforePatient.getBuildType()==2 && beforePatient.getIsAutoFm()==1){
  1483 + if (beforePatient != null && beforePatient.getBuildType() == 2 && beforePatient.getIsAutoFm() == 1) {
1352 1484 // 修改末次月经时在孕期就修改为孕妇状态
1353   - if(i == 1){
  1485 + if (i == 1) {
1354 1486 patient.setType(1);
1355 1487 patient.setBuildType(0);
1356 1488 patient.setModified(new Date());
... ... @@ -1367,7 +1499,7 @@
1367 1499 pmodel.setType(1);
1368 1500 personService.updatePerson(pmodel, yunRequest.getPid());
1369 1501 }
1370   - }else if((i == -1 || i == 0) && beforePatient.getFmDate()!=null){//自动分娩改成孕妇后，有修改末次月经成满足分娩在自动分娩
  1502 + } else if ((i == -1 || i == 0) && beforePatient.getFmDate() != null) {//自动分娩改成孕妇后，有修改末次月经成满足分娩在自动分娩
1371 1503 patientsService.setAutoMatDeliver(patient.getCardNo(), null);
1372 1504 }
1373 1505 } catch (Exception e) {
1374 1506  
1375 1507  
1376 1508  
1377 1509  
1378 1510  
... ... @@ -1380,48 +1512,42 @@
1380 1512 /**
1381 1513 * 更新当前产程所有的档案的信息
1382 1514 */
1383   - private void updateCurrentAllPatientInfo(Patients patient)
1384   - {
  1515 + private void updateCurrentAllPatientInfo(Patients patient) {
1385 1516 PatientsQuery patientsQuery = new PatientsQuery();
1386 1517 patientsQuery.setYn(YnEnums.YES.getId());
1387 1518 patientsQuery.setPid(patient.getPid());
1388 1519 patientsQuery.setLastMensesStart(patient.getLastMenses());
1389 1520 List<Patients> localPatients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
1390   - if (CollectionUtils.isNotEmpty(localPatients))
1391   - {
1392   - for (Patients pat : localPatients)
1393   - {
1394   - if (!pat.getId().equals(patient.getId()))
1395   - {
1396   - getPatientsData(pat,patient);
  1521 + if (CollectionUtils.isNotEmpty(localPatients)) {
  1522 + for (Patients pat : localPatients) {
  1523 + if (!pat.getId().equals(patient.getId())) {
  1524 + getPatientsData(pat, patient);
1397 1525 yunBookbuildingService.updatePregnant(pat, pat.getId());
1398 1526 }
1399 1527 }
1400 1528 }
1401 1529  
1402   - if (patient != null)
1403   - {
  1530 + if (patient != null) {
1404 1531 //更新分娩记录中的产后修供养地址
1405 1532 MatDeliverQuery deliverQuery = new MatDeliverQuery();
1406 1533 deliverQuery.setYn(YnEnums.YES.getId());
1407 1534 deliverQuery.setPid(patient.getPid());
1408 1535 List<MaternalDeliverModel> maternalDeliverModels = matDeliverService.query(deliverQuery);
1409   - if (CollectionUtils.isNotEmpty(maternalDeliverModels))
1410   - {
  1536 + if (CollectionUtils.isNotEmpty(maternalDeliverModels)) {
1411 1537 MaternalDeliverModel model = maternalDeliverModels.get(0);
1412 1538 model.setProvincePostRestId(patient.getProvincePostRestId());
1413 1539 model.setCityPostRestId(patient.getCityPostRestId());
1414 1540 model.setAreaPostRestId(patient.getStreetPostRestId());
1415 1541 model.setStreetPostRestId(patient.getProvincePostRestId());
1416 1542 model.setAddressPostRest(patient.getAddressPostRest());
1417   - matDeliverService.updateOne(model,model.getId());
  1543 + matDeliverService.updateOne(model, model.getId());
1418 1544 }
1419 1545 }
1420 1546  
1421 1547 }
1422 1548  
1423 1549  
1424   - public void getPatientsData(Patients patient,Patients updatePatient) {
  1550 + public void getPatientsData(Patients patient, Patients updatePatient) {
1425 1551 patient.setChildExtAddrs(updatePatient.getChildExtAddrs());
1426 1552 patient.setReqHusband(updatePatient.getReqHusband());
1427 1553 patient.setFuckLastMens(updatePatient.getFuckLastMens());
... ... @@ -1568,8 +1694,7 @@
1568 1694  
1569 1695  
1570 1696 //衡水区域并且不是衡水市第六人民医院
1571   - if("12".equals(org.getCityId()) && !"2100002324".equals(hospitalId))
1572   - {
  1697 + if ("12".equals(org.getCityId()) && !"2100002324".equals(hospitalId)) {
1573 1698 hids.remove("2100002324");//衡水六院登陆
1574 1699 }
1575 1700  
1576 1701  
... ... @@ -1692,9 +1817,9 @@
1692 1817 }
1693 1818  
1694 1819 String comm = "未分配";
1695   - if(StringUtils.isNotEmpty(pat.getCommunityId())){
  1820 + if (StringUtils.isNotEmpty(pat.getCommunityId())) {
1696 1821 CommunityConfig communityConfig = communityConfigService.getCommunityById(pat.getCommunityId());
1697   - if(null != communityConfig){
  1822 + if (null != communityConfig) {
1698 1823 comm = communityConfig.getName();
1699 1824 }
1700 1825 }
1701 1826  
... ... @@ -1738,9 +1863,9 @@
1738 1863 // 居住类型
1739 1864 List<BasicConfigResult> liveType = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.LIVE_TYPE_ID);
1740 1865 //秦皇岛需求-增加有居住证，客服配置（其他地区不需要这个选项,前端公共页面调用这个接口这里需处理）
1741   - if(StringUtils.isNotEmpty(hospitalId) && !"216".equals(hospitalId)){
  1866 + if (StringUtils.isNotEmpty(hospitalId) && !"216".equals(hospitalId)) {
1742 1867 for (BasicConfigResult basicConfigResult : liveType) {
1743   - if("有居住证".equals(basicConfigResult.getName())){
  1868 + if ("有居住证".equals(basicConfigResult.getName())) {
1744 1869 liveType.remove(basicConfigResult);
1745 1870 break;
1746 1871 }
1747 1872  
1748 1873  
1749 1874  
... ... @@ -1801,18 +1926,18 @@
1801 1926 patientsQuery.setCardNo(bookbuildingQueryRequest.getCardNo());
1802 1927 patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery, "bookbuildingDate", Sort.Direction.DESC);
1803 1928 }
1804   - List<Map<String,String>> list = new ArrayList();
  1929 + List<Map<String, String>> list = new ArrayList();
1805 1930 Map<String, String> map = new HashMap<>();
1806 1931 if (CollectionUtils.isNotEmpty(patients)) {
1807 1932 Patients patients1 = patients.get(0);
1808 1933  
1809 1934 //孕妇基本信息
1810   - map.put("username",patients1.getUsername() );//姓名
  1935 + map.put("username", patients1.getUsername());//姓名
1811 1936 map.put("cardNo", patients1.getCardNo());//证件号
1812   - map.put("pcountryId",getBasicConfig(patients1.getPcountryId()));//孕妇国籍
  1937 + map.put("pcountryId", getBasicConfig(patients1.getPcountryId()));//孕妇国籍
1813 1938 map.put("pnationId", getBasicConfig(patients1.getPnationId()));//孕妇民族
1814   - map.put("pcensusTypeId",getBasicConfig(patients1.getPcensusTypeId()));//户籍类型
1815   - map.put("pprofessionTypeId",getBasicConfig(patients1.getPprofessionTypeId()));//职业类别
  1939 + map.put("pcensusTypeId", getBasicConfig(patients1.getPcensusTypeId()));//户籍类型
  1940 + map.put("pprofessionTypeId", getBasicConfig(patients1.getPprofessionTypeId()));//职业类别
1816 1941  
1817 1942 //孕妇联系方式
1818 1943 map.put("phone", patients1.getPhone());//联系方式
1819 1944  
1820 1945  
1821 1946  
1822 1947  
1823 1948  
1824 1949  
... ... @@ -1829,44 +1954,44 @@
1829 1954 map.put("register", register);//孕妇居户籍地址
1830 1955 String postRest = CommonsHelper.getResidence(patients1.getProvincePostRestId(), patients1.getCityPostRestId(),
1831 1956 patients1.getAreaPostRestId(), patients1.getStreetPostRestId(), patients1.getAddressPostRest(), basicConfigService);
1832   - map.put("postRest",postRest );// 产后休养地
  1957 + map.put("postRest", postRest);// 产后休养地
1833 1958  
1834 1959 //丈夫信息
1835 1960 map.put("husbandName", patients1.getHusbandName());//丈夫姓名
1836 1961 map.put("hcertificateNum", patients1.getHcertificateNum());//丈夫证件号码
1837   - map.put("hcountryId",getBasicConfig(patients1.getHcountryId()));//国籍
  1962 + map.put("hcountryId", getBasicConfig(patients1.getHcountryId()));//国籍
1838 1963 map.put("hnationId", getBasicConfig(patients1.getHnationId()));//民族
1839 1964 map.put("husbandPhone", patients1.getHusbandPhone());//丈夫联系方式
1840   - map.put("hprofessionTypeId",getBasicConfig(patients1.getHprofessionTypeId()) );//职业类别
1841   - map.put("hworkUnit",patients1.getHworkUnit());//工作单位
  1965 + map.put("hprofessionTypeId", getBasicConfig(patients1.getHprofessionTypeId()));//职业类别
  1966 + map.put("hworkUnit", patients1.getHworkUnit());//工作单位
1842 1967 //map.put("", );//请输入丈夫工作单位
1843 1968 String husbandRegister = CommonsHelper.getResidence(patients1.getHprovinceRegisterId(), patients1.getHcityRegisterId(),
1844 1969 patients1.getHareaRegisterId(), patients1.getHstreetRegisterId(), patients1.getHaddressRegister(),
1845 1970 basicConfigService);
1846   - map.put("husbandRegister",husbandRegister ); //丈夫户籍地址
  1971 + map.put("husbandRegister", husbandRegister); //丈夫户籍地址
1847 1972 // 院内信息
1848 1973 map.put("lastMenses", DateUtil.getyyyy_MM_dd(patients1.getLastMenses()));//末次月经
1849   - map.put("mensStopStartDay",patients1.getMensStopStartDay());//月经停留开始天数
1850   - map.put("mensStopEndDay",patients1.getMensStopEndDay());//月经停留结束天数
1851   - map.put("mensStartDay",patients1.getMensStopEndDay());//月经周期开始天数
1852   - map.put("mensEndDay",patients1.getMensStopEndDay());//月经周期结束天数
1853   - map.put("lastMenstrualPeriodBasisDate",DateUtil.getyyyy_MM_dd(patients1.getLastMenses()));//末次月经纠正时间
1854   - map.put("dueDate",DateUtil.getyyyy_MM_dd(patients1.getDueDate()));//预产期
1855   - map.put("fileCode",patients1.getFileCode());//档案编号
1856   - map.put("vcCardNo",patients1.getVcCardNo());//就诊卡号
1857   - map.put("mremark",patients1.getMremark());//备注
1858   - map.put("bookbuildingDoctor",couponMapper.findUserName(patients1.getBookbuildingDoctor()));//建档医生
1859   - map.put("bookbuildingDate",DateUtil.getyyyy_MM_dd(patients1.getBookbuildingDate()));//建档日期
  1974 + map.put("mensStopStartDay", patients1.getMensStopStartDay());//月经停留开始天数
  1975 + map.put("mensStopEndDay", patients1.getMensStopEndDay());//月经停留结束天数
  1976 + map.put("mensStartDay", patients1.getMensStopEndDay());//月经周期开始天数
  1977 + map.put("mensEndDay", patients1.getMensStopEndDay());//月经周期结束天数
  1978 + map.put("lastMenstrualPeriodBasisDate", DateUtil.getyyyy_MM_dd(patients1.getLastMenses()));//末次月经纠正时间
  1979 + map.put("dueDate", DateUtil.getyyyy_MM_dd(patients1.getDueDate()));//预产期
  1980 + map.put("fileCode", patients1.getFileCode());//档案编号
  1981 + map.put("vcCardNo", patients1.getVcCardNo());//就诊卡号
  1982 + map.put("mremark", patients1.getMremark());//备注
  1983 + map.put("bookbuildingDoctor", couponMapper.findUserName(patients1.getBookbuildingDoctor()));//建档医生
  1984 + map.put("bookbuildingDate", DateUtil.getyyyy_MM_dd(patients1.getBookbuildingDate()));//建档日期
1860 1985  
1861 1986 OrganizationQuery query = new OrganizationQuery();
1862 1987 query.setId(Integer.parseInt(patients1.getTownOrgId()));
1863 1988 query.setYn(YnEnums.YES.getId());
1864 1989 List<Organization> organizationList = masterOrganizationMapper.queryOrganization(query);
1865 1990 String name = "";
1866   - if(CollectionUtils.isNotEmpty(organizationList)){
  1991 + if (CollectionUtils.isNotEmpty(organizationList)) {
1867 1992 name = organizationList.get(0).getName();
1868 1993 }
1869   - map.put("townOrgId",name);//乡镇卫生机构
  1994 + map.put("townOrgId", name);//乡镇卫生机构
1870 1995 list.add(map);
1871 1996  
1872 1997 }
... ... @@ -1936,8 +2061,8 @@
1936 2061 patient.setAddressRegister(yunRequest.getPregnantCensusAddr());
1937 2062  
1938 2063 //增加村villageRegister字段这里为了全局展示拼接到Address详细字段中
1939   - if(StringUtils.isNotEmpty(yunRequest.getVillageRegister())){
1940   - patient.setAddressRegister(yunRequest.getVillageRegister()+yunRequest.getPregnantCensusAddr());
  2064 + if (StringUtils.isNotEmpty(yunRequest.getVillageRegister())) {
  2065 + patient.setAddressRegister(yunRequest.getVillageRegister() + yunRequest.getPregnantCensusAddr());
1941 2066 }
1942 2067 //增加村字段，出生证明需要用必填
1943 2068 patient.setVillageRegister(yunRequest.getVillageRegister());
... ... @@ -1962,8 +2087,7 @@
1962 2087 patient.setStreetPostRestId(yunRequest.getChildbirthStreetId());
1963 2088  
1964 2089  
1965   - if(yunRequest.getReqHusband() != null && yunRequest.getReqHusband())
1966   - {
  2090 + if (yunRequest.getReqHusband() != null && yunRequest.getReqHusband()) {
1967 2091 //丈夫信息
1968 2092 patient.setHusbandName("");
1969 2093 patient.setHcertificateTypeId("");
1970 2094  
1971 2095  
... ... @@ -1992,16 +2116,13 @@
1992 2116  
1993 2117 patient.setRiskLevelId(yunRequest.getLevel());
1994 2118 String riskFactorId = yunRequest.getRiskFactorId();
1995   - if(org.apache.commons.lang3.StringUtils.isNotEmpty(riskFactorId)){
  2119 + if (org.apache.commons.lang3.StringUtils.isNotEmpty(riskFactorId)) {
1996 2120 patient.setRiskFactorId(Arrays.asList(riskFactorId.split(",")));
1997 2121 }
1998   - if (StringUtils.isNotEmpty(yunRequest.getId()))
1999   - {
2000   - patientsService.updatePatientHusbandBirth(yunRequest.getId(),null);
  2122 + if (StringUtils.isNotEmpty(yunRequest.getId())) {
  2123 + patientsService.updatePatientHusbandBirth(yunRequest.getId(), null);
2001 2124 }
2002   - }
2003   - else
2004   - {
  2125 + } else {
2005 2126 //丈夫信息
2006 2127 patient.setHusbandName(yunRequest.getHusbandName());
2007 2128 patient.setHcertificateTypeId(yunRequest.getHusbandCertificateTypeId());
... ... @@ -2043,8 +2164,8 @@
2043 2164 patient.setHstreetId(yunRequest.getHstreetId());
2044 2165 patient.setHaddress(yunRequest.getHaddress());
2045 2166 //增加村字段这里为了全局展示拼接到Address详细字段中
2046   - if(StringUtils.isNotEmpty(yunRequest.getHvillage())){
2047   - patient.setHaddress(yunRequest.getHvillage()+yunRequest.getHaddress());
  2167 + if (StringUtils.isNotEmpty(yunRequest.getHvillage())) {
  2168 + patient.setHaddress(yunRequest.getHvillage() + yunRequest.getHaddress());
2048 2169 }
2049 2170 //村字段，出生证明需要用必填
2050 2171 patient.setHvillage(yunRequest.getHvillage());
... ... @@ -2174,7 +2295,7 @@
2174 2295 result = getResult(p);
2175 2296 result.setNextCheckTime(DateUtil.getyyyy_MM_dd(p.getNextCheckTime()));
2176 2297 result.setcDueWeek(p.getcDueWeek());
2177   - if(StringUtils.isNotEmpty(p.getYyzyfmHospitalId())){
  2298 + if (StringUtils.isNotEmpty(p.getYyzyfmHospitalId())) {
2178 2299 Map<String, String> doctorObj = new HashMap<>();
2179 2300 doctorObj.put("id", p.getYyzyfmHospitalId());
2180 2301 doctorObj.put("name", StringUtils.isNotEmpty(p.getYyzyfmHospitalId()) ? organizationService.getOrganizationName(p.getYyzyfmHospitalId()) : "");
2181 2302  
... ... @@ -2255,17 +2376,17 @@
2255 2376 result.setPregnantCensusCityId(p.getCityRegisterId());
2256 2377 result.setPregnantCensusAreaId(p.getAreaRegisterId());
2257 2378 result.setPregnantCensusStreetId(p.getStreetRegisterId());
2258   - String villageRegister="";//村
2259   - String addressRegister="";//详细地址
2260   - if(StringUtils.isNotEmpty(p.getAddressRegister())){
2261   - addressRegister=p.getAddressRegister();
  2379 + String villageRegister = "";//村
  2380 + String addressRegister = "";//详细地址
  2381 + if (StringUtils.isNotEmpty(p.getAddressRegister())) {
  2382 + addressRegister = p.getAddressRegister();
2262 2383 }
2263 2384 //系统中村是后加字段。为了原系统展示，村和详细地址是拼接在一起的。这里要取门牌号需要截取掉村。
2264 2385 if (StringUtils.isNotEmpty(p.getVillageRegister())) {
2265   - villageRegister=p.getVillageRegister();
2266   - if(StringUtils.isNotEmpty(addressRegister) &&
2267   - addressRegister.length()>villageRegister.length()){
2268   - addressRegister=addressRegister.substring(villageRegister.length());
  2386 + villageRegister = p.getVillageRegister();
  2387 + if (StringUtils.isNotEmpty(addressRegister) &&
  2388 + addressRegister.length() > villageRegister.length()) {
  2389 + addressRegister = addressRegister.substring(villageRegister.length());
2269 2390 }
2270 2391 }
2271 2392 //增加村字段，出生证明需要用必填
... ... @@ -2279,7 +2400,6 @@
2279 2400 result.setPregnantLiveAddr(p.getAddress());
2280 2401  
2281 2402  
2282   -
2283 2403 result.setChildbirthAddr(p.getAddressPostRest());
2284 2404 result.setChildbirthProvinceId(p.getProvincePostRestId());
2285 2405 result.setChildbirthCityId(p.getCityPostRestId());
2286 2406  
... ... @@ -2309,17 +2429,17 @@
2309 2429 result.setHcityId(p.getHcityId());
2310 2430 result.setHareaId(p.getHareaId());
2311 2431 result.setHstreetId(p.getHstreetId());
2312   - String hvillage="";//村
2313   - String haddress="";//详细地址
2314   - if(StringUtils.isNotEmpty(p.getHaddress())){
2315   - haddress=p.getHaddress();
  2432 + String hvillage = "";//村
  2433 + String haddress = "";//详细地址
  2434 + if (StringUtils.isNotEmpty(p.getHaddress())) {
  2435 + haddress = p.getHaddress();
2316 2436 }
2317 2437 //系统中村是后加字段。为了原系统展示，村和详细地址是拼接在一起的。这里要取门牌号需要截取掉村。
2318 2438 if (StringUtils.isNotEmpty(p.getHvillage())) {
2319   - hvillage=p.getHvillage();
2320   - if(StringUtils.isNotEmpty(haddress) &&
2321   - haddress.length()>hvillage.length()){
2322   - haddress=haddress.substring(hvillage.length());
  2439 + hvillage = p.getHvillage();
  2440 + if (StringUtils.isNotEmpty(haddress) &&
  2441 + haddress.length() > hvillage.length()) {
  2442 + haddress = haddress.substring(hvillage.length());
2323 2443 }
2324 2444 }
2325 2445 result.setHvillage(hvillage);
... ... @@ -2374,7 +2494,6 @@
2374 2494 result.setNormal(p.getNormal() == null ? "1" : p.getNormal());
2375 2495  
2376 2496  
2377   -
2378 2497 result.setMarriageAge(p.getMarriageAge());
2379 2498 result.setLevelTypeId(p.getLevelTypeId());
2380 2499 result.setMarriageStatus(p.getMarriageStatus());
... ... @@ -2594,6 +2713,7 @@
2594 2713 objectResponse.setErrormsg("成功");
2595 2714 return objectResponse;
2596 2715 }
  2716 +
2597 2717 /**
2598 2718 * 滦平定制
2599 2719 *
... ... @@ -2603,7 +2723,7 @@
2603 2723 * @Author: 武涛涛
2604 2724 * @Date: 2020/11/5 16:02
2605 2725 */
2606   - public BaseObjectResponse queryHospitalsLp(Integer userId,String keyWord, Integer page, Integer limit) {
  2726 + public BaseObjectResponse queryHospitalsLp(Integer userId, String keyWord, Integer page, Integer limit) {
2607 2727 String hospitalId = autoMatchFacade.getHospitalId(userId);
2608 2728  
2609 2729 OrganizationQuery organizationQuery = new OrganizationQuery();
... ... @@ -2623,7 +2743,7 @@
2623 2743 if (CollectionUtils.isNotEmpty(orgs)) {
2624 2744 Map<String, String> maplp = new HashMap<>();
2625 2745 for (Organization org : orgs) {
2626   - if(org.getId()!=null && org.getId().toString().equals(hospitalId)){
  2746 + if (org.getId() != null && org.getId().toString().equals(hospitalId)) {
2627 2747 maplp.put("id", org.getId() + "");
2628 2748 maplp.put("name", org.getName());
2629 2749 }
2630 2750  
... ... @@ -2633,10 +2753,10 @@
2633 2753 mapList.add(map);
2634 2754 }
2635 2755 mapList.add(maplp);
2636   - if(CollectionUtils.isNotEmpty(mapList)){
2637   - Collections.swap(mapList, mapList.size()-1, 0);
  2756 + if (CollectionUtils.isNotEmpty(mapList)) {
  2757 + Collections.swap(mapList, mapList.size() - 1, 0);
2638 2758 Map<String, String> mapqt = new HashMap<>();
2639   - mapqt.put("id","21000013770000001"+ "");
  2759 + mapqt.put("id", "21000013770000001" + "");
2640 2760 mapqt.put("name", "其他");
2641 2761 mapList.add(mapqt);
2642 2762 }
... ... @@ -2650,6 +2770,7 @@
2650 2770 objectResponse.setErrormsg("成功");
2651 2771 return objectResponse;
2652 2772 }
  2773 +
2653 2774 /**
2654 2775 * 获取医院列表，授权限限制
2655 2776 *
2656 2777  
... ... @@ -2659,11 +2780,11 @@
2659 2780 * @Author: 武涛涛
2660 2781 * @Date: 2020/7/17 16:35
2661 2782 */
2662   - public BaseObjectResponse queryHospitalsHs( Integer userId,String keyWord, Integer page, Integer limit) {
  2783 + public BaseObjectResponse queryHospitalsHs(Integer userId, String keyWord, Integer page, Integer limit) {
2663 2784  
2664 2785 String hospitalId = autoMatchFacade.getHospitalId(userId);
2665 2786 List<String> hospitalList = new ArrayList<>();
2666   - if(null!=hospitalId){
  2787 + if (null != hospitalId) {
2667 2788 //当前用户本院
2668 2789 hospitalList.add(hospitalId);
2669 2790 }
2670 2791  
2671 2792  
2672 2793  
... ... @@ -3388,29 +3509,29 @@
3388 3509 }
3389 3510  
3390 3511 public BaseResponse updateTransientInfo(String pid, String pliveTypeId, String liveCardNo) {
3391   - BaseResponse br=new BaseResponse();
3392   - if (StringUtils.isEmpty(pid)|| StringUtils.isEmpty(pliveTypeId)) {
  3512 + BaseResponse br = new BaseResponse();
  3513 + if (StringUtils.isEmpty(pid) || StringUtils.isEmpty(pliveTypeId)) {
3393 3514 br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
3394 3515 br.setErrormsg("参数不能为空");
3395 3516 return br;
3396 3517 }
3397 3518 Query query = Query.query(Criteria.where("pid").is(pid));
3398   - mongoTemplate.updateMulti(query, Update.update("pliveTypeId", pliveTypeId).set("liveCardNo",liveCardNo), Patients.class);
  3519 + mongoTemplate.updateMulti(query, Update.update("pliveTypeId", pliveTypeId).set("liveCardNo", liveCardNo), Patients.class);
3399 3520 br.setErrorcode(ErrorCodeConstants.SUCCESS);
3400 3521 br.setErrormsg("成功");
3401 3522 return br;
3402 3523 }
3403 3524  
3404 3525 public Map getWifeHubbyAddress(String cardNo) {
3405   - Map map=new HashMap();
3406   - Query query=new Query();
  3526 + Map map = new HashMap();
  3527 + Query query = new Query();
3407 3528 query.addCriteria(Criteria.where("yn").is(1));
3408 3529 query.addCriteria(Criteria.where("type").is(3));
3409 3530 query.addCriteria(Criteria.where("cardNo").is(cardNo));
3410 3531 query.with(new Sort(Sort.Direction.DESC, "created"));
3411 3532 List<Patients> patientsList = mongoTemplate.find(query, Patients.class);
3412 3533 if (CollectionUtils.isNotEmpty(patientsList)) {
3413   - Patients patient=patientsList.get(0);
  3534 + Patients patient = patientsList.get(0);
3414 3535 //母亲户籍所在地-省
3415 3536 String MQHJSS = CommonsHelper.getName1(patient.getProvinceId(), basicConfigService);
3416 3537 map.put("MQHJSS", StringUtils.isEmpty(MQHJSS) ? "/" : MQHJSS);
... ... @@ -3460,7 +3581,7 @@
3460 3581 String FQZZCT = "";
3461 3582 //门牌号（详细地址）
3462 3583 String FQZZMPH = "";
3463   - if(StringUtils.isNotEmpty(FQZZSS)) {
  3584 + if (StringUtils.isNotEmpty(FQZZSS)) {
3464 3585 //父 亲 住 址 - 省 （ 自 治 区、直辖市）
3465 3586 map.put("FQZZSS", StringUtils.isEmpty(FQZZSS) ? "/" : FQZZSS);
3466 3587 //父 亲 住 址 - 市 （ 地 区 、 州）
... ... @@ -3487,7 +3608,7 @@
3487 3608 map.put("FQZZMPH", StringUtils.isEmpty(FQZZMPH) ? "/" : FQZZMPH);
3488 3609 //父 亲 住 址 行 政 区 划 代 码
3489 3610 map.put("FQ_ZZXZQHDM", organizationService.getAreaCode(FQZZQX));
3490   - }else {//如果父亲没有填居住地，用妻子的居住地填充
  3611 + } else {//如果父亲没有填居住地，用妻子的居住地填充
3491 3612 //父 亲 住 址 - 省 （ 自 治 区、直辖市）
3492 3613 map.put("FQZZSS", StringUtils.isEmpty(MQZZSS) ? "/" : MQZZSS);
3493 3614 //父 亲 住 址 - 市 （ 地 区 、 州）
3494 3615  
3495 3616  
3496 3617  
3497 3618  
3498 3619  
3499 3620  
3500 3621  
3501 3622  
3502 3623  
3503 3624  
3504 3625  
... ... @@ -3537,50 +3658,50 @@
3537 3658 //父亲户籍所在地-门牌号
3538 3659 map.put("FQHJMPH", StringUtils.isEmpty(patient.getHaddressRegister()) ? "/" : patient.getHaddressRegister());
3539 3660 //母亲证面地址详情，必填。单亲无母亲信息填“/”(出生证上面取得是户籍地)
3540   - String MQZMDZXQ="/";
3541   - if(StringUtils.isNotEmpty(patient.getProvinceId()) && StringUtils.isNotEmpty(patient.getCityId()) &&
  3661 + String MQZMDZXQ = "/";
  3662 + if (StringUtils.isNotEmpty(patient.getProvinceId()) && StringUtils.isNotEmpty(patient.getCityId()) &&
3542 3663 StringUtils.isNotEmpty(patient.getAreaId()) && StringUtils.isNotEmpty(patient.getStreetId()) &&
3543   - StringUtils.isNotEmpty(patient.getAddress())){
3544   - MQZMDZXQ= CommonsHelper.getResidence(patient.getProvinceId(), patient.getCityId(), patient.getAreaId(), patient.getStreetId(), patient.getAddress(), basicConfigService);
  3664 + StringUtils.isNotEmpty(patient.getAddress())) {
  3665 + MQZMDZXQ = CommonsHelper.getResidence(patient.getProvinceId(), patient.getCityId(), patient.getAreaId(), patient.getStreetId(), patient.getAddress(), basicConfigService);
3545 3666 }
3546   - map.put("MQZMDZXQ",MQZMDZXQ);
  3667 + map.put("MQZMDZXQ", MQZMDZXQ);
3547 3668 //父亲证面地址详情，必填，单亲无父亲信息填“/”(出生证上面取得是户籍地)
3548   - String FQZMDZXQ="/";
3549   - if(StringUtils.isNotEmpty(patient.getHprovinceRegisterId()) && StringUtils.isNotEmpty(patient.getHcityRegisterId()) &&
  3669 + String FQZMDZXQ = "/";
  3670 + if (StringUtils.isNotEmpty(patient.getHprovinceRegisterId()) && StringUtils.isNotEmpty(patient.getHcityRegisterId()) &&
3550 3671 StringUtils.isNotEmpty(patient.getHareaRegisterId()) && StringUtils.isNotEmpty(patient.getHstreetRegisterId()) &&
3551   - StringUtils.isNotEmpty(patient.getHaddressRegister())){
3552   - FQZMDZXQ= CommonsHelper.getResidence(patient.getHprovinceRegisterId(), patient.getHcityRegisterId(), patient.getHareaRegisterId(), patient.getHstreetRegisterId(), patient.getHaddressRegister(), basicConfigService);
  3672 + StringUtils.isNotEmpty(patient.getHaddressRegister())) {
  3673 + FQZMDZXQ = CommonsHelper.getResidence(patient.getHprovinceRegisterId(), patient.getHcityRegisterId(), patient.getHareaRegisterId(), patient.getHstreetRegisterId(), patient.getHaddressRegister(), basicConfigService);
3553 3674 }
3554   - map.put("FQZMDZXQ",FQZMDZXQ);
  3675 + map.put("FQZMDZXQ", FQZMDZXQ);
3555 3676  
3556 3677 }
3557 3678 return map;
3558 3679 }
3559 3680  
3560   - public BaseObjectResponse queryRecommend(RecommendQuery recommendQuery,Integer userId) {
  3681 + public BaseObjectResponse queryRecommend(RecommendQuery recommendQuery, Integer userId) {
3561 3682 String hospitalId = autoMatchFacade.getHospitalId(userId);
3562 3683 //预约分娩医院是当前登录医院
3563   - if(StringUtils.isNotEmpty(hospitalId)){
  3684 + if (StringUtils.isNotEmpty(hospitalId)) {
3564 3685 recommendQuery.setYyzyfmHospitalId(hospitalId);
3565 3686 }
3566 3687 //是否隐藏 更改为：0，转诊建档，待接收 1，转诊建档，已接收 2，隐藏建档，在A院建档去B医院做产检
3567 3688 recommendQuery.setExtEnable(false);
3568 3689 MongoQuery query = recommendQuery.convertToQuery().addOrder(Sort.Direction.DESC, "bookbuildingDate");
3569 3690 AggregationOperation queryParam = Aggregation.match(query.getCriteria());
3570   - AggregationOperation group = Aggregation.group("townOrgId","recommend");
  3691 + AggregationOperation group = Aggregation.group("townOrgId", "recommend");
3571 3692 AggregationOperation month = project().
3572 3693 andExpression("townOrgId").as("townOrgId").
3573 3694 andExpression("recommend").as("recommend");
3574   - Aggregation aggregation= Aggregation.newAggregation(queryParam,month, group);
  3695 + Aggregation aggregation = Aggregation.newAggregation(queryParam, month, group);
3575 3696  
3576 3697 final AggregationResults<Patients> lyms_patient = mongoTemplate.aggregate(aggregation, "lyms_patient", Patients.class);
3577   - List<Map> result=new ArrayList<>();
  3698 + List<Map> result = new ArrayList<>();
3578 3699 for (Patients patients : lyms_patient) {
3579 3700 recommendQuery.setRecommend(patients.getRecommend());
3580 3701 recommendQuery.setTownOrgId(patients.getTownOrgId());
3581 3702 final long count = mongoTemplate.count(recommendQuery.convertToQuery().convertToMongoQuery(), Patients.class);
3582   - Map map=new HashMap();
3583   - map=MapUtil.beanToMap(patients);
  3703 + Map map = new HashMap();
  3704 + map = MapUtil.beanToMap(patients);
3584 3705 map.put("recommendCount", count);
3585 3706 final String townOrgName = organizationService.getOrganizationName(patients.getTownOrgId());
3586 3707 map.put("townOrgName", townOrgName);
3587 3708  
... ... @@ -3593,10 +3714,10 @@
3593 3714 return objectResponse;
3594 3715 }
3595 3716  
3596   - public BaseObjectResponse queryRecommendInfo(RecommendQuery recommendQuery,Integer userId) {
  3717 + public BaseObjectResponse queryRecommendInfo(RecommendQuery recommendQuery, Integer userId) {
3597 3718 String hospitalId = autoMatchFacade.getHospitalId(userId);
3598 3719 //预约分娩医院是当前登录医院
3599   - if(StringUtils.isNotEmpty(hospitalId)){
  3720 + if (StringUtils.isNotEmpty(hospitalId)) {
3600 3721 recommendQuery.setYyzyfmHospitalId(hospitalId);
3601 3722 }
3602 3723 //是否隐藏 更改为：0，转诊建档，待接收 1，转诊建档，已接收 2，隐藏建档，在A院建档去B医院做产检
3603 3724  
3604 3725  
... ... @@ -3604,16 +3725,16 @@
3604 3725 MongoQuery query = recommendQuery.convertToQuery();
3605 3726 query.convertToMongoQuery().toString();
3606 3727 //分页后总数量
3607   - recommendQuery.mysqlBuild((int)mongoTemplate.count(query.convertToMongoQuery(),Patients.class));
  3728 + recommendQuery.mysqlBuild((int) mongoTemplate.count(query.convertToMongoQuery(), Patients.class));
3608 3729 //分页
3609 3730 query.start(recommendQuery.getOffset()).end(recommendQuery.getLimit());
3610 3731 //排序
3611 3732 query.addOrder(Sort.Direction.DESC, "bookbuildingDate");
3612 3733 List<Patients> patientses = mongoTemplate.find(query.convertToMongoQuery(), Patients.class);
3613   - List<Map> result=new ArrayList<>();
  3734 + List<Map> result = new ArrayList<>();
3614 3735 for (Patients patients : patientses) {
3615 3736 //孕周
3616   - String dueWeek="";
  3737 + String dueWeek = "";
3617 3738 try {
3618 3739 if (patients.getBookbuildingDate().getTime() - patients.getDueDate().getTime() > 0 && patients.getBuildType() == 2) {
3619 3740 dueWeek = "已分娩";
... ... @@ -3634,11 +3755,11 @@
3634 3755 final String residenceAddress = CommonsHelper.getResidence(patients.getProvinceRegisterId(), patients.getCityRegisterId(), patients.getAreaRegisterId(), patients.getStreetRegisterId(), patients.getAddressRegister(), basicConfigService);
3635 3756 //预约住院分娩医院
3636 3757 final String makeHospital = organizationService.getOrganizationName(patients.getYyzyfmHospitalId());
3637   - Map map=new HashMap();
3638   - map=MapUtil.beanToMap(patients);
3639   - map.put("dueWeek",dueWeek);
3640   - map.put("residenceAddress",residenceAddress);
3641   - map.put("makeHospital",makeHospital);
  3758 + Map map = new HashMap();
  3759 + map = MapUtil.beanToMap(patients);
  3760 + map.put("dueWeek", dueWeek);
  3761 + map.put("residenceAddress", residenceAddress);
  3762 + map.put("makeHospital", makeHospital);
3642 3763 result.add(map);
3643 3764 }
3644 3765 BaseObjectResponse objectResponse = new BaseObjectResponse();
... ... @@ -3649,8 +3770,8 @@
3649 3770 return objectResponse;
3650 3771 }
3651 3772  
3652   - public BaseObjectResponse queryAreaOrgs( Integer userId) {
3653   - Query query=new Query();
  3773 + public BaseObjectResponse queryAreaOrgs(Integer userId) {
  3774 + Query query = new Query();
3654 3775 query.addCriteria(Criteria.where("id").exists(true));
3655 3776 List<AreaAddressModel> models = mongoTemplate.find(query, AreaAddressModel.class);
3656 3777 BaseObjectResponse objectResponse = new BaseObjectResponse();
3657 3778  
3658 3779  
... ... @@ -3667,17 +3788,17 @@
3667 3788 usersQuery.setYn(1);
3668 3789 List<Users> list = usersService.queryUsers(usersQuery);
3669 3790 BaseObjectResponse objectResponse = new BaseObjectResponse();
3670   - if (list.size()==1){
  3791 + if (list.size() == 1) {
3671 3792 Users userr = list.get(0);
3672   - Organization organization =masterOrganizationMapper.getOrganization(userr.getDeptId());
  3793 + Organization organization = masterOrganizationMapper.getOrganization(userr.getDeptId());
3673 3794 List<BasicConfig> basicConfigList = basicConfigDao.queryBasicConfig(MongoCondition.newInstance("parentId", organization.getAreaId(), MongoOper.IS).
3674 3795 and("yn", YnEnums.YES.getId(), MongoOper.IS).toMongoQuery());
3675 3796  
3676 3797 // Map map=new HashMap();
3677 3798  
3678   - List<Map> datas=new ArrayList<>();
3679   - for (BasicConfig basicConfig : basicConfigList){
3680   - Map<String,Object> map=new HashMap<>();
  3799 + List<Map> datas = new ArrayList<>();
  3800 + for (BasicConfig basicConfig : basicConfigList) {
  3801 + Map<String, Object> map = new HashMap<>();
3681 3802 List<BasicConfig> basicConfigList1 = basicConfigDao.queryBasicConfig(MongoCondition.newInstance("parentId", basicConfig.getId(), MongoOper.IS).
3682 3803 and("yn", YnEnums.YES.getId(), MongoOper.IS).toMongoQuery());
3683 3804  
... ... @@ -3688,8 +3809,8 @@
3688 3809 // map.put("parentId",basicConfig1.getParentId());
3689 3810 // Maplist.add(map);
3690 3811 // }
3691   - map.put("basicConfigListname",basicConfig);
3692   - map.put("map",basicConfigList1);
  3812 + map.put("basicConfigListname", basicConfig);
  3813 + map.put("map", basicConfigList1);
3693 3814 datas.add(map);
3694 3815  
3695 3816 }
... ... @@ -3697,7 +3818,7 @@
3697 3818 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
3698 3819 objectResponse.setErrormsg("成功");
3699 3820 return objectResponse;
3700   - }else{
  3821 + } else {
3701 3822 objectResponse.setData(null);
3702 3823 objectResponse.setErrorcode(ErrorCodeConstants.NO_DATA);
3703 3824 objectResponse.setErrormsg("失败");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/MybatisSqlInterceptor.java View file @ 8c66ad1
... ... @@ -72,6 +72,7 @@
72 72 noUses.add("user_organization_maps");
73 73 noUses.add("user_role_maps");
74 74 noUses.add("lyms_week_project");
  75 + noUses.add("lyms_factor_project");
75 76 }
76 77  
77 78 private String sql;