From eeca824721cdd15093d3178897b65cf450750e72 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 25 Sep 2017 18:16:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=8F=E9=99=A2=E7=AE=A1=E7=90=86=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/master/PatientMarkHospitalMapper.java      |  3 +
 .../platform/permission/model/PatientService.java  | 12 ++++
 .../permission/model/ReportMakeHosptail.java       | 49 ++++++++++++++
 .../service/PatientMarkHospitalService.java        |  3 +
 .../impl/PatientMarkHospitalServiceImpl.java       |  6 ++
 .../mainOrm/master/PatientMarkHospital.xml         |  7 ++
 .../web/controller/PatientServiceController.java   |  4 +-
 .../web/facade/PatientMarkHospServiceFacade.java   | 63 +++++++++++++++--
 .../operate/web/facade/PatientServiceFacade.java   | 78 ++++++++++++----------
 9 files changed, 181 insertions(+), 44 deletions(-)
 create mode 100644 platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportMakeHosptail.java

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientMarkHospitalMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientMarkHospitalMapper.java
index 28baec2..3020e05 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientMarkHospitalMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PatientMarkHospitalMapper.java
@@ -2,6 +2,7 @@ package com.lyms.platform.permission.dao.master;
 
 import com.lyms.platform.permission.model.PatientMarkHospital;
 import com.lyms.platform.permission.model.PatientMarkHospitalQuery;
+import com.lyms.platform.permission.model.ReportMakeHosptail;
 
 import java.util.List;
 
@@ -18,4 +19,6 @@ public interface PatientMarkHospitalMapper {
 
     public List<PatientMarkHospital> queryPatientMarkHospital(PatientMarkHospitalQuery query);
 
+    public List<ReportMakeHosptail> reportPatMarkHospByMakeDoctor(PatientMarkHospitalQuery query);
+
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
index e698940..6d74106 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java
@@ -18,6 +18,10 @@ public class PatientService {
      */
     private Integer serType;
     /**
+     * 服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
+     */
+    private String serTypes;
+    /**
      * 指定医生
      */
     private String serDoct;
@@ -78,6 +82,14 @@ public class PatientService {
      */
     private String backUser;
 
+    public String getSerTypes() {
+        return serTypes;
+    }
+
+    public void setSerTypes(String serTypes) {
+        this.serTypes = serTypes;
+    }
+
     public Date getBackDate() {
         return backDate;
     }
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportMakeHosptail.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportMakeHosptail.java
new file mode 100644
index 0000000..fd9a978
--- /dev/null
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportMakeHosptail.java
@@ -0,0 +1,49 @@
+package com.lyms.platform.permission.model;
+
+/**
+ * @auther yangfei
+ * @createTime 2017年09月25日 17时08分
+ * @discription 住院预约统计
+ */
+public class ReportMakeHosptail {
+    //住院预约数
+    private int num;
+    //医生Id
+    private String doctorId;
+    //医生名称
+    private String doctorName;
+    //预约占比
+    private int occupCompar;
+
+    public String getDoctorName() {
+        return doctorName;
+    }
+
+    public void setDoctorName(String doctorName) {
+        this.doctorName = doctorName;
+    }
+
+    public int getOccupCompar() {
+        return occupCompar;
+    }
+
+    public void setOccupCompar(int occupCompar) {
+        this.occupCompar = occupCompar;
+    }
+
+    public int getNum() {
+        return num;
+    }
+
+    public void setNum(int num) {
+        this.num = num;
+    }
+
+    public String getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(String doctorId) {
+        this.doctorId = doctorId;
+    }
+}
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientMarkHospitalService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientMarkHospitalService.java
index ceea337..b084f31 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientMarkHospitalService.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PatientMarkHospitalService.java
@@ -2,6 +2,7 @@ package com.lyms.platform.permission.service;
 
 import com.lyms.platform.permission.model.PatientMarkHospital;
 import com.lyms.platform.permission.model.PatientMarkHospitalQuery;
+import com.lyms.platform.permission.model.ReportMakeHosptail;
 
 import java.util.List;
 
@@ -18,4 +19,6 @@ public interface PatientMarkHospitalService {
 
     public List<PatientMarkHospital> queryPatientMarkHospital(PatientMarkHospitalQuery query);
 
+    public List<ReportMakeHosptail> reportPatMarkHospByMakeDoctor(PatientMarkHospitalQuery query);
+
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientMarkHospitalServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientMarkHospitalServiceImpl.java
index c34db33..f1ceb7c 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientMarkHospitalServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PatientMarkHospitalServiceImpl.java
@@ -3,6 +3,7 @@ package com.lyms.platform.permission.service.impl;
 import com.lyms.platform.permission.dao.master.PatientMarkHospitalMapper;
 import com.lyms.platform.permission.model.PatientMarkHospital;
 import com.lyms.platform.permission.model.PatientMarkHospitalQuery;
+import com.lyms.platform.permission.model.ReportMakeHosptail;
 import com.lyms.platform.permission.service.PatientMarkHospitalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,4 +49,9 @@ public class PatientMarkHospitalServiceImpl implements PatientMarkHospitalServic
         return patientMarkHospitalMapper.queryPatientMarkHospital(query);
     }
 
+    @Override
+    public List<ReportMakeHosptail> reportPatMarkHospByMakeDoctor(PatientMarkHospitalQuery query) {
+        return patientMarkHospitalMapper.reportPatMarkHospByMakeDoctor(query);
+    }
+
 }
\ No newline at end of file
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml
index f228a11..155b184 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml
@@ -261,6 +261,13 @@
         </where>
     </sql>
 
+    <select id="reportPatMarkHospByMakeDoctor" resultType="com.lyms.platform.permission.model.ReportMakeHosptail"
+            parameterType="com.lyms.platform.permission.model.PatientMarkHospitalQuery">
+        select count(*) num,make_doctor as doctorId from patient_mark_hospital
+        <include refid="PatientMarkHospitalCondition"/>
+        GROUP BY make_doctor;
+    </select>
+
 
     <select id="queryPatientMarkHospital" resultMap="PatientMarkHospitalResultMap"
             parameterType="com.lyms.platform.permission.model.PatientMarkHospitalQuery">
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
index c324bf4..5abb97a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java
@@ -169,8 +169,8 @@ public class PatientServiceController extends BaseController {
             return baseResponse;
         }
         //serType服务类型(1-高危精准指导、2-体重、3-血糖、4-血压、5-专家咨询)
-        if(ps.getSerType()==null){
-            baseResponse.setErrormsg("请传入serType");
+        if(ps.getSerTypes()==null){
+            baseResponse.setErrormsg("请传入serTypes");
             baseResponse.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR);
             return baseResponse;
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
index ce73a9d..4078755 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java
@@ -10,10 +10,7 @@ import com.lyms.platform.common.result.BaseResponse;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.operate.web.request.PatientMarkRequest;
 import com.lyms.platform.operate.web.result.PatienMarkHospResult;
-import com.lyms.platform.permission.model.PatientMarkHospital;
-import com.lyms.platform.permission.model.PatientMarkHospitalLog;
-import com.lyms.platform.permission.model.PatientMarkHospitalQuery;
-import com.lyms.platform.permission.model.Users;
+import com.lyms.platform.permission.model.*;
 import com.lyms.platform.permission.service.PatientMarkHospitalLogService;
 import com.lyms.platform.permission.service.PatientMarkHospitalService;
 import com.lyms.platform.permission.service.UsersService;
@@ -48,6 +45,62 @@ public class PatientMarkHospServiceFacade {
     private LlfyHisService llfyHisService;
 
     /**
+     * 住院预约统计
+     * @param patientMarkRequest
+     * @param id
+     * @return
+     */
+    public BaseListResponse reportHospit(PatientMarkRequest patientMarkRequest, Integer id){
+        PatientMarkHospitalQuery query = new PatientMarkHospitalQuery();
+        //根据用户id获取医院ID
+        String hospitalId = autoMatchFacade.getHospitalId(id);
+        PatientMarkHospitalQuery patientMarkHospQuery = new PatientMarkHospitalQuery();
+        patientMarkHospQuery.setHospitalId(hospitalId);
+        PatientsQuery patientsQuery = new PatientsQuery();
+        List<Patients> patientses = null;
+        //根据查询号、当前孕周进行查询
+        if (null != patientMarkRequest.getcDueWeekStart() || null != patientMarkRequest.getcDueWeekEnd()) {
+            if (null != patientMarkRequest.getcDueWeekStart()) {
+                patientsQuery.setLastMensesEnd(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(patientMarkRequest.getcDueWeekStart() * 7)));
+            }
+            if (null != patientMarkRequest.getcDueWeekEnd()) {
+                patientsQuery.setLastMensesStart(DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(patientMarkRequest.getcDueWeekEnd() * 7) - 6));
+            }
+            patientsQuery.setHospitalId(hospitalId);
+            patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified");
+        }
+
+        if (CollectionUtils.isNotEmpty(patientses)) {
+            List<String> parentIds = new LinkedList<>();
+            for (Patients pa : patientses) {
+                parentIds.add(pa.getId());
+            }
+            patientMarkHospQuery.setPatientIds((String[]) parentIds.toArray(new String[parentIds.size()]));
+        } else if (null != patientMarkRequest.getcDueWeekStart() || null != patientMarkRequest.getcDueWeekEnd()) {
+            return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+        }
+
+        //统计数据
+        List<ReportMakeHosptail> reportMakeHosptails = patientMarkHospitalService.reportPatMarkHospByMakeDoctor(query);
+        //总数据
+        int count = patientMarkHospitalService.queryPatientMarkHospitalCount(query);
+        for(ReportMakeHosptail rm:reportMakeHosptails){
+            Users users = usersService.getUsers(Integer.parseInt(rm.getDoctorId()));
+            if (users != null) {
+                rm.setDoctorName(users.getName());
+            } else {
+                rm.setDoctorName("产检医生");
+            }
+            rm.setOccupCompar(rm.getNum()/count);
+        }
+        return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(reportMakeHosptails);
+    }
+
+
+
+
+
+    /**
      * 初始化接口
      *
      * @return
@@ -184,8 +237,6 @@ public class PatientMarkHospServiceFacade {
      * @param ps
      * @return
      */
-    ;
-
     public PatienMarkHospResult convertToResult(PatientMarkHospital ps) {
         if (ps == null) {
             return null;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
index 6873c2b..d577bd3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
@@ -117,45 +117,51 @@ public class PatientServiceFacade {
     public BaseResponse addPatientService(PatientService ps, Integer id) {
         //根据用户id获取医院ID
         String hospitalId = autoMatchFacade.getHospitalId(id);
-
-        //先根据孕妇id和开通服务类型、开通医生进行查询，如果已经开通过则开通失败
-        PatientServiceQuery patientQuery = new PatientServiceQuery();
-        patientQuery.setHospitalId(hospitalId);
-        patientQuery.setParentid(ps.getParentid());
-        patientQuery.setSerType(ps.getSerType());
-        patientQuery.setSerDoct(ps.getSerDoct());
-
-        List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
-        if (CollectionUtils.isNotEmpty(patientServices)) {
-            BaseResponse baseResponse = new BaseResponse();
-            baseResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST);
-            String serType = PatientSerEnums.SerTypeEnums.getTitle(ps.getSerType());
-            String serDoct = "产检医生";
-            Users users = usersService.getUsers(Integer.parseInt(ps.getSerDoct()));
-            if (users != null) {
-                serDoct = users.getName();
+        String [] serTypes = ps.getSerTypes().split(",");
+        for (String psType : serTypes) {
+
+            //先根据孕妇id和开通服务类型、开通医生进行查询，如果已经开通过则开通失败
+            PatientServiceQuery patientQuery = new PatientServiceQuery();
+            patientQuery.setHospitalId(hospitalId);
+            patientQuery.setParentid(ps.getParentid());
+            patientQuery.setSerType(Integer.parseInt(psType));
+            patientQuery.setSerDoct(ps.getSerDoct());
+
+            List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
+            if (CollectionUtils.isNotEmpty(patientServices)) {
+                continue;
+                // BaseResponse baseResponse = new BaseResponse();
+                // baseResponse.setErrorcode(ErrorCodeConstants.DATA_EXIST);
+                // String serType = PatientSerEnums.SerTypeEnums.getTitle(ps.getSerType());
+                // String serDoct = "产检医生";
+                // Users users = usersService.getUsers(Integer.parseInt(ps.getSerDoct()));
+                // if (users != null) {
+                //     serDoct = users.getName();
+                // }
+                // baseResponse.setErrormsg("该孕妇已开通" + serDoct + "医生的" + serType + "服务，请勿重复开通");
+                // return baseResponse;
             }
-            baseResponse.setErrormsg("该孕妇已开通" + serDoct + "医生的" + serType + "服务，请勿重复开通");
-            return baseResponse;
-        }
 
-        Patients patients = patientsService.findOnePatientById(ps.getParentid());
-        if(patients!=null){
-            ps.setPid(patients.getPid());
+            Patients patients = patientsService.findOnePatientById(ps.getParentid());
+            if (patients != null) {
+                ps.setPid(patients.getPid());
+            }
+            ps.setId(UUID.randomUUID().toString().replace("-", ""));
+            ps.setHospitalId(hospitalId);
+            ps.setCreateDate(new Date());
+            ps.setCreateUser(String.valueOf(id));
+            //默认开通状态
+            ps.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId());
+            //服务类型
+            ps.setSerType(Integer.parseInt(psType));
+            //默认已经领取
+            ps.setStatus(2);
+            //领取时间
+            ps.setReceiveDate(new Date());
+            //领取操作医生id
+            ps.setReceiveUser(String.valueOf(id));
+            patientServiceService.addPatientService(ps);
         }
-        ps.setId(UUID.randomUUID().toString().replace("-", ""));
-        ps.setHospitalId(hospitalId);
-        // ps.setCreateDate(new Date());
-        // ps.setCreateUser(String.valueOf(id));
-        //默认开通状态
-        ps.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId());
-        //默认已经领取
-        ps.setStatus(2);
-        //领取时间
-        ps.setReceiveDate(new Date());
-        //领取操作医生id
-        ps.setReceiveUser(String.valueOf(id));
-        patientServiceService.addPatientService(ps);
 
         BaseResponse baseResponse = new BaseResponse();
         baseResponse.setObject(ps.getId());
-- 
1.8.3.1