jiangjiazhi / regional-platform

Download as
Browse Code »

Commit dbba63cd5313c316f8577a411b588a9d616059c8

Authored by zhangchao
1 parent 6ec67852cb
Exists in dev

#fix:新增大同本院职工科室查询逻辑

Showing 28 changed files with 379 additions and 41 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java View file @ dbba63c
... ... @@ -12,11 +12,11 @@
12 12 import com.lyms.platform.common.utils.JsonUtil;
13 13 import com.lyms.platform.permission.DataAccessLayerService;
14 14 import com.lyms.platform.permission.dao.master.MasterLisMapper;
15   -import com.lyms.platform.permission.model.LisReportItemModel;
16   -import com.lyms.platform.permission.model.LisReportModel;
  15 +import com.lyms.platform.permission.model.*;
17 16 import com.lyms.platform.permission.model.LisReportQuery;
18 17 import com.lyms.platform.permission.service.LisService;
19 18 import com.lyms.platform.permission.service.OrganizationService;
  19 +import com.lyms.platform.permission.service.UsersService;
20 20 import com.lyms.platform.pojo.*;
21 21 import com.lyms.platform.query.*;
22 22 import net.sf.json.JSONArray;
23 23  
24 24  
25 25  
... ... @@ -192,15 +192,19 @@
192 192 patientsQuery.setName(model.getName());
193 193 patientsQuery.setSort("created");
194 194 patientsQuery.setVcCardNo(model.getVcCardNo());
  195 + patientsQuery.setType(1);
195 196 list = patientsService.queryPatient(patientsQuery);
  197 + Integer type=0;
196 198 if (list != null && list.size() > 0) {
197 199 patients = list.get(list.size() - 1);
  200 + type=patients.getType();
198 201 } else {
199 202 patientsQuery.setPhone(model.getPhone());
200 203 patientsQuery.setVcCardNo(null);
201 204 list = patientsService.queryPatient(patientsQuery);
202 205 if (list != null && list.size() > 0) {
203 206 patients = list.get(list.size() - 1);
  207 + type=patients.getType();
204 208 }
205 209  
206 210 }
... ... @@ -285,7 +289,7 @@
285 289 String time = DateUtil.getyyyy_MM_dd(new Date());
286 290 //根据辅助检查项日期判断是初检还是复检
287 291 if (antExChuModel != null &&
288   - !time.equals(DateUtil.getyyyy_MM_dd(antExChuModel.getCreated()))) {
  292 + !time.equals(DateUtil.getyyyy_MM_dd(antExChuModel.getCreated())) && type==1) {
289 293  
290 294 AntExQuery antExQuery = new AntExQuery();
291 295 antExQuery.setParentId(patients.getId());
... ... @@ -426,7 +430,7 @@
426 430 patientsService.updatePatientOne(patients,patients.getId());
427 431 }
428 432 } else {
429   - if (antExChuModel != null) {
  433 + if (antExChuModel != null &&type==1) {
430 434 boolean b = false;
431 435 boolean p=false;
432 436 if (StringUtils.isNotEmpty(params.get("HGB"))) {
... ... @@ -567,6 +571,8 @@
567 571 private AntenatalExaminationService antenatalExaminationService;
568 572 @Autowired
569 573 private AntExRecordService antExRecordService;
  574 + @Autowired
  575 + private UsersService usersService;
570 576  
571 577 public void addAntenatalExamination(AntenatalExaminationModel antenatalExaminationModel, AntExChuModel antExChuModel, Patients patients,String applyDoctor) {
572 578 if (antenatalExaminationModel.getId() != null) {
573 579  
... ... @@ -584,12 +590,25 @@
584 590 antExRecordModel.setPid(patients.getPid());
585 591 antExRecordModel.setDueDate(patients.getDueDate());
586 592 antExRecordModel.setCardNo(patients.getCardNo());
587   - antExRecordModel.setCheckDoctor(String.valueOf(patients.getOperator()));
  593 + if (StringUtils.isEmpty(applyDoctor)){
  594 + applyDoctor=String.valueOf(antExChuModel.getProdDoctor());
  595 + antExRecordModel.setCheckDoctor(applyDoctor);
  596 + }else {
  597 + UsersQuery usersQuery=new UsersQuery();
  598 + usersQuery.setYn(1);
  599 + usersQuery.setName(applyDoctor);
  600 + List<Users> usersList= usersService.queryUsers(usersQuery);
  601 + if (CollectionUtils.isNotEmpty(usersList)){
  602 + applyDoctor=String.valueOf(usersList.get(0).getId());
  603 + antExRecordModel.setCheckDoctor(applyDoctor);
  604 + }else {
  605 + applyDoctor=String.valueOf(antExChuModel.getProdDoctor());
  606 + antExRecordModel.setCheckDoctor(applyDoctor);
  607 + }
  608 + }
588 609 antExRecordModel.setType(1);
589 610 antExRecordModel.setCheckTime(new Date());
590 611 antExRecordModel.setBuildTime(new Date());
591   - //临时赋值用来占用字段
592   - antExRecordModel.setCheckDoctor(applyDoctor);
593 612 if (antExRecordModel.getDueDate() != null) {
594 613 antExRecordModel.setStatus(antExRecordModel.getDueDate().compareTo(new Date()) > 0 ? 2 : 1);
595 614 antExRecordModel.setDueStatus(antExRecordModel.getStatus());
... ... @@ -599,7 +618,7 @@
599 618 antenatalExaminationModel.setYn(1);
600 619 antenatalExaminationModel.setParentId(patients.getId());
601 620 antenatalExaminationModel.setPid(patients.getPid());
602   - antenatalExaminationModel.setCheckDoctor(String.valueOf(patients.getOperator()));
  621 + //antenatalExaminationModel.setCheckDoctor(String.valueOf(patients.getOperator()));
603 622 antenatalExaminationModel.setHospitalId(patients.getHospitalId());
604 623 antenatalExaminationModel.setName(patients.getUsername());
605 624 antenatalExaminationModel.setRiskScore(antExChuModel.getHighriskSocre());
... ... @@ -608,6 +627,7 @@
608 627 antenatalExaminationModel.setNextCheckTime(patients.getNextCheckTime());
609 628 antenatalExaminationModel.setCurrentDueDate(getBuildingWeek(patients));
610 629 antenatalExaminationModel.setCheckDate(new Date());
  630 + antenatalExaminationModel.setCheckDoctor(applyDoctor);
611 631 antenatalExaminationModel = antenatalExaminationService.addOneBabyAnt(antenatalExaminationModel);
612 632 antExRecordModel.setfId(antenatalExaminationModel.getId());
613 633 antExRecordService.addOneRecord(antExRecordModel);
platform-biz-service/src/main/resources/mainOrm/master/AppointmentMapper.xml View file @ dbba63c
... ... @@ -27,7 +27,7 @@
27 27 </if>
28 28  
29 29 <if test="name!=null">
30   - and name=#{name}
  30 + and name like concat("%",#{name},"%")
31 31 </if>
32 32 <if test="dept!=null">
33 33 and dept=#{dept}
platform-dal/src/main/java/com/lyms/platform/pojo/AntExHighRiskModel.java View file @ dbba63c
... ... @@ -6,6 +6,8 @@
6 6 import org.springframework.data.mongodb.core.mapping.Document;
7 7  
8 8 import java.util.Date;
  9 +import java.util.List;
  10 +import java.util.Map;
9 11  
10 12 @Document(collection = "lyms_antexhighrisk")
11 13 @JsonIgnoreProperties(ignoreUnknown = true)
... ... @@ -66,6 +68,66 @@
66 68 private String fetalPosition;//胎方位
67 69 private String heartRate;//胎心率
68 70 private String fetalPresentation;//胎先露
  71 +
  72 + private List<Map> visitList;//孕期回访
  73 + //分娩时间
  74 + private String dueDate;
  75 + //分娩孕周
  76 + private String dueWeek;
  77 + //分娩方式
  78 + private String deliveryMode;
  79 + //接生单位
  80 + private String fmHospital;
  81 + //产后回访记录
  82 + private String visitRecord;
  83 +
  84 + public List<Map> getVisitList() {
  85 + return visitList;
  86 + }
  87 +
  88 + public void setVisitList(List<Map> visitList) {
  89 + this.visitList = visitList;
  90 + }
  91 +
  92 + public String getDueDate() {
  93 + return dueDate;
  94 + }
  95 +
  96 + public void setDueDate(String dueDate) {
  97 + this.dueDate = dueDate;
  98 + }
  99 +
  100 + public String getDueWeek() {
  101 + return dueWeek;
  102 + }
  103 +
  104 + public void setDueWeek(String dueWeek) {
  105 + this.dueWeek = dueWeek;
  106 + }
  107 +
  108 + public String getDeliveryMode() {
  109 + return deliveryMode;
  110 + }
  111 +
  112 + public void setDeliveryMode(String deliveryMode) {
  113 + this.deliveryMode = deliveryMode;
  114 + }
  115 +
  116 + public String getFmHospital() {
  117 + return fmHospital;
  118 + }
  119 +
  120 + public void setFmHospital(String fmHospital) {
  121 + this.fmHospital = fmHospital;
  122 + }
  123 +
  124 + public String getVisitRecord() {
  125 + return visitRecord;
  126 + }
  127 +
  128 + public void setVisitRecord(String visitRecord) {
  129 + this.visitRecord = visitRecord;
  130 + }
69 131  
70 132 public String getFetalPosition() {
71 133 return fetalPosition;
platform-dal/src/main/java/com/lyms/platform/pojo/AppointmentModel.java View file @ dbba63c
... ... @@ -22,6 +22,8 @@
22 22 //是否建档 1为是 0为否
23 23 @Transient
24 24 private Integer isBuild;
  25 + @Transient
  26 + private Date serEndTime;
25 27 private Date created;
26 28  
27 29 public Integer getId() {
... ... @@ -128,6 +130,14 @@
128 130 this.isBuild = isBuild;
129 131 }
130 132  
  133 + public Date getSerEndTime() {
  134 + return serEndTime;
  135 + }
  136 +
  137 + public void setSerEndTime(Date serEndTime) {
  138 + this.serEndTime = serEndTime;
  139 + }
  140 +
131 141 @Override
132 142 public String toString() {
133 143 return "AppointmentModel{" +
... ... @@ -143,6 +153,7 @@
143 153 ", doctor='" + doctor + '\'' +
144 154 ", dept='" + dept + '\'' +
145 155 ", isBuild=" + isBuild +
  156 + ", serEndTime=" + serEndTime +
146 157 ", created=" + created +
147 158 '}';
148 159 }
platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java View file @ dbba63c
... ... @@ -516,6 +516,15 @@
516 516  
517 517 //大同职工 1为是 0为否
518 518 private Integer userType;
  519 + private String dept;
  520 +
  521 + public String getDept() {
  522 + return dept;
  523 + }
  524 +
  525 + public void setDept(String dept) {
  526 + this.dept = dept;
  527 + }
519 528  
520 529 public Integer getUserType() {
521 530 return userType;
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ dbba63c
... ... @@ -441,8 +441,17 @@
441 441 private Map<String,Date> mapTime;
442 442 //大同院内职工 1为是 0为否
443 443 private Integer userType;
  444 + //大同院内职工所属科室
  445 + private String dept;
444 446  
  447 + public String getDept() {
  448 + return dept;
  449 + }
445 450  
  451 + public void setDept(String dept) {
  452 + this.dept = dept;
  453 + }
  454 +
446 455 public Integer getUserType() {
447 456 return userType;
448 457 }
... ... @@ -1267,6 +1276,9 @@
1267 1276  
1268 1277 if (userType!=null){
1269 1278 condition = condition.and("userType", userType, MongoOper.IS);
  1279 + }
  1280 + if (dept!=null){
  1281 + condition=condition.and("dept",dept,MongoOper.IS);
1270 1282 }
1271 1283  
1272 1284 if (null != orServiceStatus && orServiceStatus.length > 1) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java View file @ dbba63c
... ... @@ -289,6 +289,22 @@
289 289 }
290 290  
291 291  
  292 + final static Integer userId=2100013059;//默认为客服ID
  293 + /**
  294 + * 获取产妇整个产程的建档记录
  295 + *
  296 + * @return
  297 + */
  298 + @RequestMapping(method = RequestMethod.GET, value = "/wx/antex/antexlist")
  299 + @ResponseBody
  300 + public BaseResponse findWxAntExList(String pid) {
  301 + /*LoginContext loginState = (LoginContext) request.getAttribute("loginContext");*/
  302 + AntExListQueryRequest exListQueryRequest=new AntExListQueryRequest();
  303 + exListQueryRequest.setPid(pid);
  304 + return antenatalExaminationFacade.findAntExListTwo(exListQueryRequest, userId);
  305 + }
  306 +
  307 +
292 308 @Autowired
293 309 private OrganizationService organizationService;
294 310  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java View file @ dbba63c
... ... @@ -15,8 +15,11 @@
15 15 import com.lyms.platform.operate.web.utils.CollectionUtils;
16 16 import com.lyms.platform.operate.web.utils.FunvCommonUtil;
17 17 import com.lyms.platform.operate.web.vo.PatientNiptDTO;
  18 +import com.lyms.platform.permission.model.PatientService;
  19 +import com.lyms.platform.permission.model.PatientServiceQuery;
18 20 import com.lyms.platform.permission.service.AppointmentService;
19 21 import com.lyms.platform.permission.service.CouponService;
  22 +import com.lyms.platform.permission.service.PatientServiceService;
20 23 import com.lyms.platform.pojo.*;
21 24 import com.lyms.platform.query.*;
22 25 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -58,6 +61,8 @@
58 61 private CouponService couponService;
59 62 @Autowired
60 63 private AppointmentService appointmentService;
  64 + @Autowired
  65 + private PatientServiceService patientServiceService;
61 66  
62 67 final static Integer userId=2100013059;//默认为客服ID
63 68 final static String hospitalId="2100002419";//大同医院ID
64 69  
... ... @@ -530,14 +535,25 @@
530 535 patientsQuery.setName(username);
531 536 patientsQuery.setPhone(phone);
532 537 }else {
533   - return baseResponse.setErrormsg("参数异常").setErrorcode(-1);
  538 + appointmentModel.setIsBuild(0);
534 539 }
535 540 }
536   - List<Patients> patientsList= patientsService.queryPatient(patientsQuery);
537   - if (CollectionUtils.isNotEmpty(patientsList)){
538   - appointmentModel.setIsBuild(1);
539   - }else {
540   - appointmentModel.setIsBuild(0);
  541 + if (appointmentModel.getIsBuild()==null){
  542 + List<Patients> patientsList= patientsService.queryPatient(patientsQuery);
  543 + if (CollectionUtils.isNotEmpty(patientsList)){
  544 + appointmentModel.setIsBuild(1);
  545 +
  546 + PatientServiceQuery patientQuery = new PatientServiceQuery();
  547 + patientQuery.setParentid(patientsList.get(0).getId());
  548 + patientQuery.setSerType(1);
  549 +
  550 + List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
  551 + if (CollectionUtils.isNotEmpty(patientServices)){
  552 + appointmentModel.setSerEndTime(patientServices.get(0).getSerEndTime());
  553 + }
  554 + }else {
  555 + appointmentModel.setIsBuild(0);
  556 + }
541 557 }
542 558 }
543 559 }
... ... @@ -563,8 +579,8 @@
563 579 }
564 580 Map<String,String> params=new HashMap<>();
565 581 params.put("doctor",doctor);
566   - params.put("ksrq",date+" 00:00:00");
567   - params.put("jsrq",date+" 23:59:59");
  582 + params.put("ksrq",date);
  583 + params.put("jsrq",date);
568 584 String str= HttpClientUtil.doGet("http://192.168.5.23:9090/dtdyrm/getdtAppointment" ,params,"utf-8",null);
569 585 System.out.println(str);
570 586 return new BaseResponse();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java View file @ dbba63c
... ... @@ -166,7 +166,8 @@
166 166 String cityId,
167 167 String areaId,
168 168 String streetId,
169   - Integer userType
  169 + Integer userType,
  170 + String dept
170 171 ) {
171 172 return postReviewService.postpartumReview(getUserId(request), startDate, endDate, doctorId, key, page, limit, startDay,
172 173 endDay, zyList, jcxList,gcDoctorId,
... ... @@ -184,7 +185,7 @@
184 185 cityId,
185 186 areaId,
186 187 streetId,
187   - userType
  188 + userType,dept
188 189 );
189 190 }
190 191  
191 192  
... ... @@ -199,10 +200,10 @@
199 200 @RequestMapping(method = RequestMethod.GET, value = "/postpartum/review/export")
200 201 @TokenRequired
201 202 public void postpartumReviewExport(Date startDate, Date endDate, String doctorId,
202   - Integer startDay, Integer endDay,Integer userType,
  203 + Integer startDay, Integer endDay,Integer userType,String dept,
203 204 String key, HttpServletRequest request, HttpServletResponse response) {
204 205 postReviewService.postpartumReviewExport(getUserId(request), startDate, endDate, doctorId, key,
205   - response,startDay, endDay,userType);
  206 + response,startDay, endDay,userType,dept);
206 207 }
207 208  
208 209  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ dbba63c
... ... @@ -415,6 +415,7 @@
415 415 patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo());
416 416 patientsQuery.setHighRiskFileCode(antExManagerQueryRequest.getHighRiskFileCode());
417 417 patientsQuery.setUserType(antExManagerQueryRequest.getUserType());
  418 + patientsQuery.setDept(antExManagerQueryRequest.getDept());
418 419 // System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
419 420 patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified");
420 421  
421 422  
... ... @@ -924,8 +925,14 @@
924 925 String dueWeek = "";
925 926 if (null != patients) {
926 927 //2017-03-15 高帆说的改成这样
927   - if (patients.getLastMenses() != null && record.getCheckTime() != null) {
  928 + if (patients.getType()==1 &&patients.getLastMenses() != null && record.getCheckTime() != null) {
928 929 int days = DateUtil.daysBetween(patients.getLastMenses(), record.getCheckTime());
  930 + String week = (days / 7) + "";
  931 + int day = (days % 7);
  932 + dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
  933 + cjStatisticsListResult.setDueWeek(dueWeek);
  934 + }else if(patients.getType()==3 &&patients.getLastMenses() != null && patients.getDueDate() != null){
  935 + int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getDueDate());
929 936 String week = (days / 7) + "";
930 937 int day = (days % 7);
931 938 dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : "");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ dbba63c
... ... @@ -1991,7 +1991,7 @@
1991 1991 if (null != groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId))) {
1992 1992 patientsQuery.setExtEnable(false);
1993 1993 }
1994   - System.out.println("查询孕妇档案：" + patientsQuery.convertToQuery().convertToMongoQuery());
  1994 + // System.out.println("查询孕妇档案：" + patientsQuery.convertToQuery().convertToMongoQuery());
1995 1995 //获取所有的建档记录
1996 1996 List <Patients> list = patientsService.queryPatient(patientsQuery);
1997 1997 AntexListResult antexListResult = new AntexListResult();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java View file @ dbba63c
... ... @@ -1372,7 +1372,7 @@
1372 1372 request.setObjType(1);
1373 1373 request.setPhone(patients.getPhone());
1374 1374 request.setPlanTime(planTime);
1375   - request.setSubTypeId(SmsServiceEnums.DXFW.getId());
  1375 + request.setSubTypeId(SmsServiceEnums.FWKT.getId());
1376 1376 request.setStatus(MsgStatusEnums.NO_SEND.getId());
1377 1377 request.setTimeType(2);
1378 1378 request.setHospitalId(hospitalId);
... ... @@ -1408,6 +1408,98 @@
1408 1408 }
1409 1409 return "";
1410 1410 }
  1411 +
  1412 + @Autowired
  1413 + private AppointmentService appointmentService;
  1414 +
  1415 + public void bookbuildingMsg(){
  1416 + //TODO 大同早上7点推送未建档提醒
  1417 + String date= DateUtil.getyyyy_MM_dd(new Date());
  1418 + String startTime=date+" 00:00:00";
  1419 + String endTime=date+" 23:59:59";
  1420 + List<AppointmentModel> modelList= appointmentService.queryAppointment("孙慧洁",startTime,endTime,null,null);
  1421 + if (CollectionUtils.isNotEmpty(modelList)){
  1422 + PatientsQuery patientsQuery =new PatientsQuery();
  1423 + patientsQuery.setYn(1);
  1424 + patientsQuery.setHospitalId("2100002419");
  1425 + List<AppointmentModel> sendList=new ArrayList<>();
  1426 + for (int i = 0,j=modelList.size(); i < j; i++) {
  1427 + AppointmentModel appointmentModel= modelList.get(i);
  1428 + String idCard=appointmentModel.getIdCard();
  1429 + String phone=appointmentModel.getPhone();
  1430 + String username=appointmentModel.getName();
  1431 + if (StringUtils.isNotEmpty(idCard)){
  1432 + patientsQuery.setCardNo(idCard);
  1433 + }else {
  1434 + if (StringUtils.isNotEmpty(username)&&StringUtils.isNotEmpty(phone)){
  1435 + patientsQuery.setName(username);
  1436 + patientsQuery.setPhone(phone);
  1437 + }else {
  1438 + appointmentModel.setIsBuild(0);
  1439 + }
  1440 + }
  1441 + if (appointmentModel.getIsBuild()==null){
  1442 + List<Patients> patientsList= patientsService.queryPatient(patientsQuery);
  1443 + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patientsList)){
  1444 + appointmentModel.setIsBuild(1);
  1445 + }else {
  1446 + appointmentModel.setIsBuild(0);
  1447 + }
  1448 + }
  1449 + if (appointmentModel.getIsBuild()==0){
  1450 + sendList.add(appointmentModel);
  1451 + }
  1452 + }
  1453 + if (CollectionUtils.isNotEmpty(sendList)){
  1454 + sendAppointmentMsg(sendList,date);
  1455 + }
  1456 + }
  1457 +
  1458 +
  1459 + }
  1460 +
  1461 +
  1462 + public void sendAppointmentMsg(List<AppointmentModel> appointmentModels,String date){
  1463 + try {
  1464 + logger.info("sendAppointmentMsg startup");
  1465 + // Thread.sleep(3000);
  1466 + List<MsgRequest> messages = new ArrayList<>();
  1467 + final String hospitalId ="2100002419";
  1468 + for (AppointmentModel appointmentModel:appointmentModels){
  1469 + MsgRequest request = new MsgRequest();
  1470 + String title = "建档提醒短信";
  1471 + String messageContent = "【大同市第一人民医院】提醒您：您还未在我院建立孕期档案，为了更好的给您提供产检服务，请尽快携带身份证、母子健康手册以及产检检查资料前往我院门诊二层孕妇网络中心进行建档。" +
  1472 + "温馨提示：“母子健康手册”在个人居住地社区卫生服务机构领取（需携带孕妇身份证明及产检资料）。";
  1473 + request.setServiceType(3);
  1474 + //短信发送状态
  1475 + request.setSmsStatus(SmsStatusEnums.WFS.getId());
  1476 + //平台ID
  1477 + request.setTypeId(ProjectTypeEnums.YNXT.getId());
  1478 + //服务对象 1孕妇 2儿童 3产妇
  1479 + request.setObjType(1);
  1480 + request.setWxTempId("tx-UmDE3YMgYaAeFccXB7HITuG_tiP9LMdX2bvBpus");
  1481 + request.setPhone(appointmentModel.getPhone());
  1482 + request.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
  1483 + request.setSubTypeId(SmsServiceEnums.FWKT.getId());
  1484 + request.setStatus(MsgStatusEnums.NO_SEND.getId());
  1485 + request.setTimeType(1);
  1486 + request.setHospitalId(hospitalId);
  1487 + request.setPatientId(appointmentModel.getVccardNo());
  1488 + request.setTempId(appointmentModel.getVccardNo());
  1489 + request.setCreated(DateUtil.getyyyy_MM_dd_hms(new Date()));
  1490 + request.setFirst(messageContent);
  1491 + request.setKeyword1(title);
  1492 + request.setKeyword2(date);
  1493 + messages.add(request);
  1494 + }
  1495 + smsConfigFacade.saveMsg(messages, hospitalId);
  1496 + logger.info("sendAppointmentMsg end");
  1497 + } catch (Exception e) {
  1498 + logger.error("sendAppointmentMsg Exception " + e);
  1499 + }
  1500 + }
  1501 +
  1502 +
1411 1503 private static final long TIMES = 24 * 60 * 60 * 1000 - 1;
1412 1504 /**
1413 1505 * 大同下午18点推送预建档未审核提醒
... ... @@ -2651,6 +2743,7 @@
2651 2743 patient.setLastCheckEmployeeId(yunRequest.getLastCheckEmployeeId());
2652 2744 patient.setHighRiskFileCode(yunRequest.getHighRiskFileCode());
2653 2745 patient.setUserType(yunRequest.getUserType());
  2746 + patient.setDept(yunRequest.getDept());
2654 2747 return patient;
2655 2748 }
2656 2749  
... ... @@ -2913,6 +3006,7 @@
2913 3006 result.setHighRiskFileCode(p.getHighRiskFileCode());
2914 3007 result.setLastCheckEmployeeId(p.getLastCheckEmployeeId());
2915 3008 result.setUserType(p.getUserType());
  3009 + result.setDept(p.getDept());
2916 3010 return result;
2917 3011 }
2918 3012  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ dbba63c
... ... @@ -2613,6 +2613,7 @@
2613 2613 patientsQuery.setType(3);
2614 2614 patientsQuery.setHighRiskFileCode(childbirthManagerRequest.getHighRiskFileCode());
2615 2615 patientsQuery.setUserType(childbirthManagerRequest.getUserType());
  2616 + patientsQuery.setDept(childbirthManagerRequest.getDept());
2616 2617 // 构造医院id集合
2617 2618 List<String> hospitalList = new ArrayList<>();
2618 2619 if (StringUtils.isEmpty(childbirthManagerRequest.getIsArea())) {
... ... @@ -2736,7 +2737,7 @@
2736 2737 patientsQuery.setYyzyfmHospitalId(childbirthManagerRequest.getYyzyfmHospitalId());
2737 2738 patientsQuery.setHospitalId(childbirthManagerRequest.getFirstHospitalId());
2738 2739  
2739   - System.out.println("fm patient query = " + patientsQuery.convertToQuery().convertToMongoQuery());
  2740 + // System.out.println("fm patient query = " + patientsQuery.convertToQuery().convertToMongoQuery());
2740 2741 List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
2741 2742  
2742 2743 // 这里就设置分页内容
... ... @@ -2876,7 +2877,7 @@
2876 2877 if (null != childbirthManagerRequest.getCesareanTimeType()) {
2877 2878 matDeliverQuery.setCesareanTimeType(childbirthManagerRequest.getCesareanTimeType());
2878 2879 }
2879   - System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
  2880 + // System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
2880 2881 maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
2881 2882 // 这里就设置分页内容
2882 2883 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
... ... @@ -2945,7 +2946,7 @@
2945 2946 matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
2946 2947 matDeliverQuery.setPage(childbirthManagerRequest.getPage());
2947 2948 matDeliverQuery.setNeed("need");
2948   - System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
  2949 + // System.out.println(matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
2949 2950 maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
2950 2951 // 这里就设置分页内容
2951 2952 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
... ... @@ -2953,7 +2954,7 @@
2953 2954 matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
2954 2955 matDeliverQuery.setPage(childbirthManagerRequest.getPage());
2955 2956 matDeliverQuery.setNeed("need");
2956   - System.out.println("=========" + matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
  2957 + // System.out.println("=========" + matDeliverQuery.convertToQuery().convertToMongoQuery().toString());
2957 2958 maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
2958 2959 // 这里就设置分页内容
2959 2960 childbirthManagerResult.setPageInfo(matDeliverQuery.getPageInfo());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ dbba63c
... ... @@ -3234,6 +3234,7 @@
3234 3234  
3235 3235 patientsQuery.setYn(YnEnums.YES.getId());
3236 3236 patientsQuery.setUserType(patientManagerRequest.getUserType());
  3237 + patientsQuery.setDept(patientManagerRequest.getDept());
3237 3238 if (!patientManagerRequest.isExcel()) {
3238 3239 patientsQuery.setNeed("need");
3239 3240 patientsQuery.setLimit(patientManagerRequest.getLimit());
... ... @@ -3316,7 +3317,7 @@
3316 3317 patientsQuery.setDueStatus(null==patientManagerRequest.getDueStatus() ? null : patientManagerRequest.getDueStatus());
3317 3318 patientsQuery.setType(patientManagerRequest.getType());
3318 3319 patientsQuery.setHighRiskFileCode(patientManagerRequest.getHighRiskFileCode());
3319   - System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
  3320 + //System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
3320 3321 List <Patients> patientsList = patientsService.queryPatient(patientsQuery);
3321 3322 List <PatientManagerQueryModel> patientManagerQueryModelList = new ArrayList <>();
3322 3323 if (CollectionUtils.isNotEmpty(patientsList)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java View file @ dbba63c
... ... @@ -527,7 +527,7 @@
527 527 if (serInfo.containsKey("serviceWeek")) {
528 528 pser.setServiceWeek(Integer.parseInt(serInfo.get("serviceWeek")));
529 529 }
530   - Patients patients = patientsService.findOnePatientById(ps.getParentid());
  530 + final Patients patients = patientsService.findOnePatientById(ps.getParentid());
531 531 setServiceRecordAdd(pser, patients);
532 532  
533 533 patientServiceService.addPatientService(pser);
534 534  
... ... @@ -562,9 +562,12 @@
562 562 patient.setServiceType(ServiceTypeEnums.ADD_SERVICE.getId());
563 563 patient.setServiceStatus(ServiceStatusEnums.ADD_OPEN.getId());
564 564 bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient);
  565 + new Thread(new Runnable() {
  566 + @Override
  567 + public void run() {
  568 + sendServiceMsg(patients, SmsServiceEnums.FWKT.getId(), "您好，请点击此处查看开通服务内容详情。", "大同市第一人民医院", ServiceObjEnums.YUNOBJ.getId(), 1);
  569 + }}).start();
565 570  
566   - sendServiceMsg(patients, SmsServiceEnums.FWKT.getId(), "您好，请点击此处查看开通服务内容详情。", "大同市第一人民医院", ServiceObjEnums.YUNOBJ.getId(), 1);
567   -
568 571 } else if (PatientSerEnums.SerTypeEnums.bzfw.getId().intValue() == Integer.parseInt(serInfo.get("serType"))) {
569 572  
570 573 PatientServiceQuery query = new PatientServiceQuery();
571 574  
... ... @@ -585,8 +588,9 @@
585 588 patient.setServiceType(ServiceTypeEnums.ADD_MAT_DELIVER_SERVICE.getId());
586 589 patient.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId());
587 590 bookbuildingFacade.updatePatientSerById(ps.getParentid(), patient);
588   - sendServiceMsg(patients, SmsServiceEnums.FWKT.getId(), "您好，请点击此处查看开通服务内容详情。", "大同市第一人民医院", ServiceObjEnums.CHANOBJ.getId(), 1);
589 591  
  592 + //sendServiceMsg(patients, SmsServiceEnums.FWKT.getId(), "您好，请点击此处查看开通服务内容详情。", "大同市第一人民医院", ServiceObjEnums.CHANOBJ.getId(), 1);
  593 +
590 594 }
591 595 }
592 596 }
... ... @@ -603,7 +607,7 @@
603 607 public void sendServiceMsg(Patients patient, Integer subTypeId, String first, String keyWord1, Integer objType, Integer type) {
604 608 if ("2100002419".equals(patient.getHospitalId())) {
605 609 try {
606   - //Thread.sleep(5000);
  610 + Thread.sleep(3000);
607 611 logger.info("sendServiceMsg startup");
608 612 List<MsgRequest> messages = new ArrayList<>();
609 613 if (type != null) {
... ... @@ -620,7 +624,7 @@
620 624 request.setObjType(1);
621 625 request.setPhone(patient.getPhone());
622 626 request.setPlanTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
623   - request.setSubTypeId(SmsServiceEnums.DXFW.getId());
  627 + request.setSubTypeId(SmsServiceEnums.FWKT.getId());
624 628 request.setStatus(MsgStatusEnums.NO_SEND.getId());
625 629 request.setTimeType(SmsTimeTypeEnums.ONTIME.getId());
626 630 request.setHospitalId("2100002419");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ dbba63c
... ... @@ -604,6 +604,7 @@
604 604 map.put("closeCaseCode", data.getCloseCaseCode());
605 605 map.put("buildingManualCode", data.getBuildingManualCode());
606 606 map.put("userType",data.getUserType());
  607 + map.put("dept",data.getDept());
607 608 return map;
608 609 }
609 610  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java View file @ dbba63c
... ... @@ -141,6 +141,16 @@
141 141  
142 142 private Integer userType;
143 143  
  144 + private String dept;
  145 +
  146 + public String getDept() {
  147 + return dept;
  148 + }
  149 +
  150 + public void setDept(String dept) {
  151 + this.dept = dept;
  152 + }
  153 +
144 154 public Integer getUserType() {
145 155 return userType;
146 156 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java View file @ dbba63c
... ... @@ -158,6 +158,16 @@
158 158 private String highRiskFileCode;
159 159 //大同职工 1为是 0为否
160 160 private Integer userType;
  161 + //大同职工所属门诊
  162 + private String dept;
  163 +
  164 + public String getDept() {
  165 + return dept;
  166 + }
  167 +
  168 + public void setDept(String dept) {
  169 + this.dept = dept;
  170 + }
161 171  
162 172 public Integer getUserType() {
163 173 return userType;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java View file @ dbba63c
... ... @@ -160,6 +160,16 @@
160 160  
161 161 private String booksuifangDoctor;
162 162  
  163 + private String dept;
  164 +
  165 + public String getDept() {
  166 + return dept;
  167 + }
  168 +
  169 + public void setDept(String dept) {
  170 + this.dept = dept;
  171 + }
  172 +
163 173 public Integer getUserType() {
164 174 return userType;
165 175 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java View file @ dbba63c
... ... @@ -92,6 +92,16 @@
92 92  
93 93 private Integer userType;//大同本院职工 1为是 0为否
94 94  
  95 + private String dept;
  96 +
  97 + public String getDept() {
  98 + return dept;
  99 + }
  100 +
  101 + public void setDept(String dept) {
  102 + this.dept = dept;
  103 + }
  104 +
95 105 public Integer getUserType() {
96 106 return userType;
97 107 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntExManagerResult.java View file @ dbba63c
... ... @@ -90,6 +90,15 @@
90 90 //服务状态
91 91 private Integer serviceStatus;
92 92 private Integer serviceType;
  93 + private String dept;
  94 +
  95 + public String getDept() {
  96 + return dept;
  97 + }
  98 +
  99 + public void setDept(String dept) {
  100 + this.dept = dept;
  101 + }
93 102  
94 103 public Integer getServiceType() {
95 104 return serviceType;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ChildbirthManagerQueryModel.java View file @ dbba63c
... ... @@ -485,6 +485,16 @@
485 485 // 是否发放过优惠券
486 486 private String coupon;
487 487  
  488 + private String dept;
  489 +
  490 + public String getDept() {
  491 + return dept;
  492 + }
  493 +
  494 + public void setDept(String dept) {
  495 + this.dept = dept;
  496 + }
  497 +
488 498 public String getCreatedWeek() {
489 499 return createdWeek;
490 500 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientManagerQueryModel.java View file @ dbba63c
... ... @@ -133,10 +133,19 @@
133 133 private Date dueDate;
134 134  
135 135 private Integer userType;//大同职工 1为是 0为否
  136 + private String dept;
136 137  
137 138 //服务状态
138 139 private Integer serviceStatus;
139 140 private Integer serviceType;
  141 +
  142 + public String getDept() {
  143 + return dept;
  144 + }
  145 +
  146 + public void setDept(String dept) {
  147 + this.dept = dept;
  148 + }
140 149  
141 150 public Integer getServiceType() {
142 151 return serviceType;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PregnantInfoResult.java View file @ dbba63c
... ... @@ -57,6 +57,15 @@
57 57 private String lastCheckEmployeeId;
58 58 //大同职工专属 1为是 0为否
59 59 private Integer userType;
  60 + private String dept;
  61 +
  62 + public String getDept() {
  63 + return dept;
  64 + }
  65 +
  66 + public void setDept(String dept) {
  67 + this.dept = dept;
  68 + }
60 69  
61 70 public Integer getUserType() {
62 71 return userType;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IPostReviewService.java View file @ dbba63c
... ... @@ -30,8 +30,8 @@
30 30 String cityId,
31 31 String areaId,
32 32 String streetId,
33   - Integer userType);
  33 + Integer userType,String dept);
34 34  
35   - void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay,Integer userType);
  35 + void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay,Integer userType,String dept);
36 36 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PostReviewServiceImpl.java View file @ dbba63c
... ... @@ -78,7 +78,8 @@
78 78 String cityId,
79 79 String areaId,
80 80 String streetId,
81   - Integer userType
  81 + Integer userType,
  82 + String dept
82 83 ) {
83 84  
84 85  
... ... @@ -265,6 +266,9 @@
265 266 if (userType!=null){
266 267 criteria.and("userType").is(userType);
267 268 }
  269 + if (StringUtils.isNotEmpty(dept)){
  270 + criteria.and("dept").is(dept);
  271 + }
268 272 List<Patients> patients = mongoUtil.findField(Patients.class, criteria, "id");
269 273 if(CollectionUtils.isEmpty(patients)) {
270 274 return RespBuilder.buildSuccess(new PageResult(0, page, limit, null));
... ... @@ -302,7 +306,7 @@
302 306 .and("hospitalId").is(model.getHospitalId())), PostReviewModel.class));*/ /** 本院复查次数 */
303 307 tempMap.put("reviewHospitalCount", mongoTemplate.count(Query.query(Criteria.where("pid").is(model.getPid()).and("yn").is(YnEnums.YES.getId())
304 308 .and("hospitalId").is(hospitalId)), PostReviewModel.class)); /** 本院复查次数 */
305   -
  309 + tempMap.put("dept",p.getDept());
306 310 String prodDoctor = model.getProdDoctor();
307 311 if(StringUtils.isNotEmpty(prodDoctor)) {
308 312 Users users = usersMapper.getUsers(Integer.parseInt(prodDoctor));
309 313  
... ... @@ -344,9 +348,9 @@
344 348 }
345 349  
346 350 @Override
347   - public void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay,Integer userType) {
  351 + public void postpartumReviewExport(Integer userId, Date startDate, Date endDate, String doctorId, String key, HttpServletResponse response,Integer startDay, Integer endDay,Integer userType,String dept) {
348 352 BaseObjectResponse rest = postpartumReview(userId, startDate, endDate, doctorId, key, 1, Integer.MAX_VALUE,startDay,endDay,null,null,null,null,null,null,null,null,null,null,null,null,
349   - null,null,null,null,null,userType);
  353 + null,null,null,null,null,userType,dept);
350 354 PageResult pageResult = (PageResult) rest.getData();
351 355 List<Map<String, Object>> datas = (List<Map<String, Object>>) pageResult.getGrid();
352 356 Map<String, String> cnames = new LinkedHashMap<>();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/AntExRecordWorker.java View file @ dbba63c
... ... @@ -140,6 +140,7 @@
140 140 if(patients == null || patients.getLastMenses() == null){
141 141 continue;
142 142 }
  143 + antExManagerResult.setDept(patients.getDept());
143 144 antExManagerResult.setServiceStatus(patients.getServiceStatus());
144 145 antExManagerResult.setServiceType(patients.getServiceType());
145 146 antExRecordQuery1.setCheckTimeStart(patients.getLastMenses());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/worker/MaterDeliverWorker.java View file @ dbba63c
... ... @@ -791,6 +791,7 @@
791 791 AntExChuQuery antExChuQuery = new AntExChuQuery();
792 792 antExChuQuery.setYn(YnEnums.YES.getId());
793 793 antExChuQuery.setParentId(patients.getId());
  794 + childbirthManagerQueryModel.setDept(patients.getDept());
794 795 List <AntExChuModel> antExChuModels = antExService.queryAntExChu(antExChuQuery);//初诊记录
795 796 if(CollectionUtils.isNotEmpty(antExChuModels)){
796 797 AntExChuModel antExChuModel = antExChuModels.get(0);