From 210053dafd34945b5f26f852bb336cd84854391e Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Wed, 10 Jan 2018 00:16:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8F=98=E5=90=8C=E6=AD=A5=E5=8C=BB?= =?UTF-8?q?=E7=94=9F=E5=92=8C=E6=82=A3=E8=80=85=E5=85=B3=E7=B3=BB=E7=9A=84?= =?UTF-8?q?=E7=AD=96=E7=95=A5=20=20=E5=8A=A0=E4=BD=93=E9=87=8D=E7=9A=84?= =?UTF-8?q?=E6=97=B6=E5=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/biz/dal/IDoctorUserMapServiceDao.java | 9 +++ .../biz/dal/impl/DoctorUserMapDaoImpl.java | 16 +++++ .../platform/biz/service/DoctorUserMapService.java | 19 ++++++ .../java/com/lyms/platform/beans/SerialIdEnum.java | 1 + .../java/com/lyms/platform/pojo/DoctorUserMap.java | 71 ++++++++++++++++++++++ .../operate/web/controller/TestController.java | 5 ++ .../operate/web/service/IDoctorUserMapService.java | 9 +++ .../web/service/impl/DoctorUserMapServiceImpl.java | 24 ++++++++ .../web/service/impl/PatientWeightServiceImpl.java | 23 +++++-- 9 files changed, 172 insertions(+), 5 deletions(-) create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IDoctorUserMapServiceDao.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/DoctorUserMapDaoImpl.java create mode 100644 platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DoctorUserMapService.java create mode 100644 platform-dal/src/main/java/com/lyms/platform/pojo/DoctorUserMap.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IDoctorUserMapService.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DoctorUserMapServiceImpl.java diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IDoctorUserMapServiceDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IDoctorUserMapServiceDao.java new file mode 100644 index 0000000..020e05a --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IDoctorUserMapServiceDao.java @@ -0,0 +1,9 @@ +package com.lyms.platform.biz.dal; + +import com.lyms.platform.pojo.DoctorUserMap; + +public interface IDoctorUserMapServiceDao { + + void add(DoctorUserMap doctorUserMap); + +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/DoctorUserMapDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/DoctorUserMapDaoImpl.java new file mode 100644 index 0000000..66d08a1 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/DoctorUserMapDaoImpl.java @@ -0,0 +1,16 @@ +package com.lyms.platform.biz.dal.impl; + +import com.lyms.platform.biz.dal.IDoctorUserMapServiceDao; +import com.lyms.platform.common.dao.BaseMongoDAOImpl; +import com.lyms.platform.pojo.DoctorUserMap; +import org.springframework.stereotype.Repository; + +@Repository +public class DoctorUserMapDaoImpl extends BaseMongoDAOImpl implements IDoctorUserMapServiceDao { + + @Override + public void add(DoctorUserMap doctorUserMap) { + save(doctorUserMap); + } + +} diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DoctorUserMapService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DoctorUserMapService.java new file mode 100644 index 0000000..cccc4d7 --- /dev/null +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/DoctorUserMapService.java @@ -0,0 +1,19 @@ +package com.lyms.platform.biz.service; + + +import com.lyms.platform.biz.dal.IDoctorUserMapServiceDao; +import com.lyms.platform.pojo.DoctorUserMap; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class DoctorUserMapService { + + @Autowired + private IDoctorUserMapServiceDao doctorUserMapServiceDao; + + public void add(DoctorUserMap doctorUserMap) { + doctorUserMapServiceDao.add(doctorUserMap); + } + +} diff --git a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java index 2c876f5..644b391 100644 --- a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java +++ b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java @@ -57,6 +57,7 @@ public enum SerialIdEnum { PatientCheckTicket("PatientCheckTicket", 97531000450L), AntExPRecordModel("AntExPRecordModel", 97531000451L), PatientWeight("PatientWeight", 97531000111L), + DoctorUserMap("DoctorUserMap", 97531222111L), BloodPressure("BloodPressure", 97531333111L), BloodSugar("BloodSugar", 97111333111L), TempModel("TempModel", 97111333112L), diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/DoctorUserMap.java b/platform-dal/src/main/java/com/lyms/platform/pojo/DoctorUserMap.java new file mode 100644 index 0000000..96abd7c --- /dev/null +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/DoctorUserMap.java @@ -0,0 +1,71 @@ +package com.lyms.platform.pojo; + +import com.lyms.platform.beans.SerialIdEnum; +import com.lyms.platform.common.result.BaseModel; +import org.springframework.data.mongodb.core.mapping.Document; + +/** + * 添加体重的时候 绑定医生和患者的关系 + */ +@Document(collection="lyms_doctor_user") +public class DoctorUserMap extends BaseModel { + + private static final long serialVersionUID = SerialIdEnum.DoctorUserMap.getCid(); + + private String id; + + private String patientId; + + private String doctorName; + + private String hospitalName; + + private String foreignId; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getPatientId() { + return patientId; + } + + public void setPatientId(String patientId) { + this.patientId = patientId; + } + + public String getDoctorName() { + return doctorName; + } + + public void setDoctorName(String doctorName) { + this.doctorName = doctorName; + } + + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } + + public String getForeignId() { + return foreignId; + } + + public void setForeignId(String foreignId) { + this.foreignId = foreignId; + } + + public DoctorUserMap(String patientId, String doctorName, String hospitalName, String foreignId) { + this.patientId = patientId; + this.doctorName = doctorName; + this.hospitalName = hospitalName; + this.foreignId = foreignId; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 5dd448b..40054ba 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -144,6 +144,11 @@ public class TestController { } + @ResponseBody + @RequestMapping("/sync/doctor/user") + public List doctorUserMaps() { + return mongoTemplate.findAllAndRemove(new Query(), DoctorUserMap.class); + } @ResponseBody @RequestMapping("/init/patient/weight") diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IDoctorUserMapService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IDoctorUserMapService.java new file mode 100644 index 0000000..fd600ff --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IDoctorUserMapService.java @@ -0,0 +1,9 @@ +package com.lyms.platform.operate.web.service; + +import com.lyms.platform.pojo.DoctorUserMap; + +public interface IDoctorUserMapService extends IBaseService { + + void add(DoctorUserMap DoctorUserMap); + +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DoctorUserMapServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DoctorUserMapServiceImpl.java new file mode 100644 index 0000000..6a46bec --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/DoctorUserMapServiceImpl.java @@ -0,0 +1,24 @@ +package com.lyms.platform.operate.web.service.impl; + +import com.lyms.platform.biz.service.DoctorUserMapService; +import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.operate.web.service.IDoctorUserMapService; +import com.lyms.platform.pojo.DoctorUserMap; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.stereotype.Service; + +@Service +public class DoctorUserMapServiceImpl extends BaseServiceImpl implements IDoctorUserMapService { + + @Autowired + private DoctorUserMapService doctorUserMapService; + + @Autowired + private MongoTemplate mongoTemplate; + + @Override + public void add(DoctorUserMap doctorUserMap) { + doctorUserMapService.add(doctorUserMap); + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 96fb0fe..5433325 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -1,8 +1,11 @@ package com.lyms.platform.operate.web.service.impl; +import com.lyms.platform.biz.service.DoctorUserMapService; import com.lyms.platform.biz.service.PatientWeightService2; import com.lyms.platform.biz.service.PatientsService; -import com.lyms.platform.common.enums.*; +import com.lyms.platform.common.enums.BregmaticEnums2; +import com.lyms.platform.common.enums.OptActionEnums; +import com.lyms.platform.common.enums.RemoteServerEnmus; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.PageResult; import com.lyms.platform.common.result.RespBuilder; @@ -16,6 +19,7 @@ import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.MathUtil; import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.permission.dao.master.CouponMapper; +import com.lyms.platform.pojo.DoctorUserMap; import com.lyms.platform.pojo.PatientWeight; import com.lyms.platform.pojo.Patients; import net.sf.json.JSONArray; @@ -59,6 +63,9 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient @Autowired private OrganizationGroupsFacade groupsFacade; + @Autowired + private DoctorUserMapService doctorUserMapService; + /** * 最低:0~13 : 0~1.9 13~40 1.9~11.9 * 最高: 0~2.2 2.2~15.9 @@ -88,14 +95,17 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } // 绑定医生和患者的关系 - String patSerSyncUrl = Config.getItem("patSer_sync_url", "0"); + /* String patSerSyncUrl = Config.getItem("patSer_sync_url", "0"); Map param = new HashMap<>(); param.put("doctorName", couponMapper.findUserName(userId + "")); param.put("patientId", patients.getId()); param.put("hospitalName", couponMapper.findHospitalNameById(hospitalId)); param.put("foreignId", userId + ""); String s = HttpClientUtil.doPost(patSerSyncUrl + "/grWeContr/bindDoctorUser", param, "UTF-8"); - System.out.println("绑定医生和患者的关系>>. " + s + " param: " + param); + System.out.println("绑定医生和患者的关系>>. " + s + " param: " + param);*/ + + DoctorUserMap doctorUserMap = new DoctorUserMap(patientWeight.getPatientId(), couponMapper.findUserName(userId + ""), couponMapper.findHospitalNameById(hospitalId), userId + ""); + doctorUserMapService.add(doctorUserMap); /* if(pw != null && StringUtils.isNotEmpty(patientWeight.getBeforeWeight())) { return RespBuilder.buildErro(ResponseCode.PATIENT_WEIGHT_IS_EXIST); @@ -580,14 +590,17 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), beforePatientWeight, patientWeight,OptActionEnums.UPDATE.getId(), "修改孕体重"); // 绑定医生和患者的关系 - String patSerSyncUrl = Config.getItem("patSer_sync_url", "0"); + /* String patSerSyncUrl = Config.getItem("patSer_sync_url", "0"); Map param = new HashMap<>(); param.put("doctorName", couponMapper.findUserName(userId + "")); param.put("patientId", patientWeight.getPatientId()); param.put("hospitalName", couponMapper.findHospitalNameById(hospitalId)); param.put("foreignId", userId + ""); String s = HttpClientUtil.doPost(patSerSyncUrl + "/grWeContr/bindDoctorUser", param, "UTF-8"); - System.out.println("绑定医生和患者的关系>>. " + s + " param: " + param); + System.out.println("绑定医生和患者的关系>>. " + s + " param: " + param);*/ + + DoctorUserMap doctorUserMap = new DoctorUserMap(patientWeight.getPatientId(), couponMapper.findUserName(userId + ""), couponMapper.findHospitalNameById(hospitalId), userId + ""); + doctorUserMapService.add(doctorUserMap); if(StringUtils.isNotEmpty(beforeWeight)) { patientWeight.setBeforeWeight(beforeWeight); -- 1.8.3.1