From 68b90b9bdfb1e4c6952111ec4f9d3422c02c35d0 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 27 Sep 2017 12:20:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainOrm/master/PatientMarkHospital.xml         | 52 +++++++++++-----------
 .../com/lyms/hospitalapi/pojo/PieReportModel.java  | 19 ++++++++
 .../controller/PatientMarkHospitalController.java  | 14 ++++++
 .../web/facade/PatientMarkHospServiceFacade.java   |  5 ++-
 4 files changed, 63 insertions(+), 27 deletions(-)
 create mode 100644 platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PieReportModel.java

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 f014b5c..179967b 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml
@@ -299,32 +299,32 @@
         GROUP BY back_doctor;
     </select>
 
-    <select id="reportPatMarkHospByInDoctor" resultType="com.lyms.platform.permission.model.ReportMakeHosptail"
-            parameterType="com.lyms.platform.permission.model.PatientMarkHospitalQuery">
-        SELECT
-        in_hospit_doctor as doctorId,
-        count(*) AS num,
-        sum(
-        CASE in_hospit_result
-        WHEN 1 THEN
-        1
-        ELSE
-        0
-        END
-        ) AS succNum,
-        sum(
-        CASE in_hospit_result
-        WHEN 2 THEN
-        1
-        ELSE
-        0
-        END
-        ) AS errNum from
-        patient_mark_hospital
-        <include refid="PatientMarkHospitalCondition"/>
-        and in_hospit_doctor is not null
-        GROUP BY in_hospit_doctor;
-    </select>
+    <!--<select id="reportPatMarkHospByInDoctor" resultType="com.lyms.platform.permission.model.ReportMakeHosptail"-->
+            <!--parameterType="com.lyms.platform.permission.model.PatientMarkHospitalQuery">-->
+        <!--SELECT-->
+        <!--in_hospit_doctor as doctorId,-->
+        <!--count(*) AS num,-->
+        <!--sum(-->
+        <!--CASE in_hospit_result-->
+        <!--WHEN 1 THEN-->
+        <!--1-->
+        <!--ELSE-->
+        <!--0-->
+        <!--END-->
+        <!--) AS succNum,-->
+        <!--sum(-->
+        <!--CASE in_hospit_result-->
+        <!--WHEN 2 THEN-->
+        <!--1-->
+        <!--ELSE-->
+        <!--0-->
+        <!--END-->
+        <!--) AS errNum from-->
+        <!--patient_mark_hospital-->
+        <!--<include refid="PatientMarkHospitalCondition"/>-->
+        <!--and in_hospit_doctor is not null-->
+        <!--GROUP BY in_hospit_doctor;-->
+    <!--</select>-->
     <select id="reportPatMarkHospByInDoctor" resultType="com.lyms.platform.permission.model.ReportMakeHosptail"
             parameterType="com.lyms.platform.permission.model.PatientMarkHospitalQuery">
         SELECT
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PieReportModel.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PieReportModel.java
new file mode 100644
index 0000000..d4254c8
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/PieReportModel.java
@@ -0,0 +1,19 @@
+package com.lyms.hospitalapi.pojo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @auther yangfei
+ * @createTime 2017年09月27日 11时59分
+ * @discription
+ */
+public class PieReportModel {
+    /**
+     *
+     */
+    public List<String> legendData;
+    /** 数据列表 */
+    private List<Map<String, Object>> seriesData;
+
+}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java
index 3032863..7f2c32a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientMarkHospitalController.java
@@ -45,6 +45,20 @@ public class PatientMarkHospitalController extends BaseController {
      * @param request
      * @return
      */
+    @RequestMapping(value = "/reportHospit", method = {RequestMethod.POST, RequestMethod.GET})
+    @ResponseBody
+    @TokenRequired
+    public BaseResponse reportHospit(PatientMarkRequest patientMarkRequest
+            , HttpServletRequest request) {
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        return patientMarkHospFacade.reportHospit(patientMarkRequest,loginState.getId());
+    }
+
+    /**
+     * 预约住院提醒列表
+     * @param request
+     * @return
+     */
     @RequestMapping(value = "/list", method = {RequestMethod.POST, RequestMethod.GET})
     @ResponseBody
     @TokenRequired
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 244ec1a..b55f09a 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
@@ -79,8 +79,11 @@ public class PatientMarkHospServiceFacade {
             } else {
                 rm.setDoctorName("产检医生");
             }
-            rm.setOccupCompar(rm.getNum()/count);
         }
+
+
+
+
         return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(reportMakeHosptails);
     }
 
-- 
1.8.3.1