From af4f352566b00c605c69b8ec80122d93cefad54a Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 31 Oct 2017 11:40:57 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E5=8F=96=E8=AE=BE=E5=A4=87=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/permission/model/PatientService.java  | 12 ++++
 .../permission/model/PatientServiceQuery.java      | 12 ++++
 .../master/BabyPatientExtendEarHearingDiagnose.xml |  1 +
 .../resources/mainOrm/master/PatientService.xml    | 13 +++-
 .../web/controller/HearingDiagnoseController.java  |  1 -
 .../operate/web/controller/SyncDataController.java | 82 ++++++++++++++++------
 .../operate/web/facade/PatientServiceFacade.java   | 50 ++++++++++++-
 .../web/facade/PatientServiceSysFacade.java        |  2 +-
 .../platform/operate/web/facade/SysBaseFacade.java |  2 +-
 .../resources/spring/applicationContext-quartz.xml |  4 +-
 10 files changed, 149 insertions(+), 30 deletions(-)

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 71fbc9a..f2917f7 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
@@ -85,6 +85,18 @@ public class PatientService {
      * 订单号
      */
     private String orderId;
+    /**
+     * 同步状态 默认不需要同步、1-待同步、2-已同步
+     */
+    private Integer synStatus;
+
+    public Integer getSynStatus() {
+        return synStatus;
+    }
+
+    public void setSynStatus(Integer synStatus) {
+        this.synStatus = synStatus;
+    }
 
     public String getOrderId() {
         return orderId;
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
index 663ab33..6a8c518 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java
@@ -59,6 +59,18 @@ public class PatientServiceQuery extends BaseQuery {
      * 订单号
      */
     private String orderId;
+    /**
+     * 同步状态 默认不需要同步、1-待同步、2-已同步
+     */
+    private Integer synStatus;
+
+    public Integer getSynStatus() {
+        return synStatus;
+    }
+
+    public void setSynStatus(Integer synStatus) {
+        this.synStatus = synStatus;
+    }
 
     public String getOrderId() {
         return orderId;
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml
index 19bfc53..78b0685 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEarHearingDiagnose.xml
@@ -912,6 +912,7 @@ select id,baby_id,hospital_id,diagnose_time,high_factor,abr_left_dbnhl,abr_left_
         from baby_patient_extend_ear_hearing_diagnose hd
         <where>
             1=1
+            and ifdel = 0
             <if test="diagnoseStartTime!=null">
                 AND
                 <![CDATA[
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
index dc55c74..e527837 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml
@@ -23,12 +23,13 @@
         <result column="back_date" property="backDate" jdbcType="TIMESTAMP" />
         <result column="back_user" property="backUser" jdbcType="VARCHAR" />
         <result column="order_id" property="orderId" jdbcType="VARCHAR" />
+        <result column="syn_status" property="synStatus" jdbcType="INTEGER" />
     </resultMap>
 
 
 
     <insert id="addPatientService" parameterType="com.lyms.platform.permission.model.PatientService">
-        insert into patient_service (id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},#{updateUserName},#{updateUser},#{hospitalId},#{serCode},#{status},#{receiveDate},#{receiveUser},#{backDate},#{backUser},#{orderId})
+        insert into patient_service (id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},#{updateUserName},#{updateUser},#{hospitalId},#{serCode},#{status},#{receiveDate},#{receiveUser},#{backDate},#{backUser},#{orderId},#{synStatus})
     </insert>
 
 
@@ -91,6 +92,9 @@
         <if test="orderId != null and orderId != ''">
             order_id = #{orderId,jdbcType=VARCHAR},
         </if>
+        <if test="synStatus != null and synStatus != ''">
+            syn_status = #{synStatus,jdbcType=INTEGER},
+        </if>
     </set>
         where id = #{id,jdbcType=VARCHAR}
     </update>
@@ -103,7 +107,7 @@
 
 
     <select id="getPatientService" resultMap="PatientServiceResultMap" parameterType="java.lang.String">
-        select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id
+        select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status
         from patient_service where id = #{id,jdbcType=VARCHAR}
     </select>
 
@@ -199,6 +203,9 @@
             <if test="orderId != null and orderId != ''">
                 and order_id = #{orderId,jdbcType=VARCHAR}
             </if>
+            <if test="synStatus != null and synStatus != ''">
+                and syn_status = #{synStatus,jdbcType=INTEGER}
+            </if>
             <if test="sql != null and sql != ''">
                 ${sql}
             </if>
@@ -206,7 +213,7 @@
     </sql>
 
     <select id="queryPatientService" resultMap="PatientServiceResultMap" parameterType="com.lyms.platform.permission.model.PatientServiceQuery">
-        select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id
+        select id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id,syn_status
         from patient_service
         <include refid="PatientServiceCondition" />
         <include refid="orderAndLimit" />
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java
index 6040726..487a565 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/HearingDiagnoseController.java
@@ -501,7 +501,6 @@ public class HearingDiagnoseController extends BaseController {
         query.setHospitalId(hospitalId);
         query.setSort("diagnose_time desc");
 
-
         //已经诊断的数据
         List<BabyPatientExtendEarHearingDiagnose> hearingDiagnoseList = hearingDiagnoseService.getHdAndScreen(query);
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java
index 9d4625a..e0dddca 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SyncDataController.java
@@ -17,12 +17,14 @@ import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.ReflectionUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.context.ContextLoader;
 import org.springframework.web.context.WebApplicationContext;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.lang.reflect.Method;
 import java.util.List;
 
 /**
@@ -44,6 +46,9 @@ public class SyncDataController extends BaseController {
     /**
      * 小程序同步数据接口
      *
+     * @param action  请求处理类 默认执行execute方法
+     * @param synForm 请求数据
+     *
      * @return
      */
     @ResponseBody
@@ -51,13 +56,50 @@ public class SyncDataController extends BaseController {
     public BaseResponse sysnDataSer(
             @RequestParam(value = "action", required = true) String action,
             @RequestParam(value = "synForm", required = true) String synForm
-    ){
-        try{
-            System.out.println("数据同步开始：action:"+action+",synForm:"+synForm);
+    ) {
+        try {
+            System.out.println("数据同步开始：action:" + action + ",synForm:" + synForm);
+            WebApplicationContext webApplicationContext = ContextLoader.getCurrentWebApplicationContext();
+            SysBaseFacade sysBaseFacade = (SysBaseFacade) webApplicationContext.getBean(action);
+            return sysBaseFacade.execute(synForm);
+        } catch (Exception e) {
+            BaseResponse baseResponse = new BaseResponse();
+            baseResponse.setObject(e.getMessage());
+            baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
+            baseResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION);
+            return baseResponse;
+        }
+    }
+
+    /**
+     * 小程序同步数据接口
+     *
+     * @param action  请求处理类
+     * @param synForm 请求数据
+     * @param method  请求处理方法，默认执行execute
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/sysnReflectDataSer", method = RequestMethod.POST)
+    public BaseResponse sysnReflectDataSer(
+            @RequestParam(value = "action", required = true) String action,
+            @RequestParam(value = "synForm", required = false) String synForm,
+            @RequestParam(value = "method", required = true) String method
+    ) {
+        try {
+            System.out.println("数据同步开始：action:" + action + ",synForm:" + synForm);
             WebApplicationContext webApplicationContext = ContextLoader.getCurrentWebApplicationContext();
-            SysBaseFacade sysBaseFacade = (SysBaseFacade)webApplicationContext.getBean(action);
-            return sysBaseFacade.sysData(synForm);
-        }catch (Exception e){
+            //返回值
+            BaseResponse baseResponse = null;
+            if(StringUtils.isNotEmpty(synForm)){//如果有参数
+                Method mh = ReflectionUtils.findMethod(webApplicationContext.getBean(action).getClass(), method, new Class[]{String.class});
+                baseResponse = (BaseResponse) ReflectionUtils.invokeMethod(mh, webApplicationContext.getBean(action), synForm);
+            }else{//无参数
+                Method mh = ReflectionUtils.findMethod(webApplicationContext.getBean(action).getClass(), method, null);
+                baseResponse = (BaseResponse) ReflectionUtils.invokeMethod(mh, webApplicationContext.getBean(action), null);
+            }
+            return baseResponse;
+        } catch (Exception e) {
             BaseResponse baseResponse = new BaseResponse();
             baseResponse.setObject(e.getMessage());
             baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
@@ -73,7 +115,7 @@ public class SyncDataController extends BaseController {
         syncDataQuery.setLimit(2000);
         syncDataQuery.setStatus(1);
         List<SyncDataModel> list = syncDataService.querySyncData(syncDataQuery);
-        for (SyncDataModel model:list) {
+        for (SyncDataModel model : list) {
             model.setModified(null);
             model.setCreated(null);
             if (model.getAction().startsWith("POST")) {
@@ -91,13 +133,13 @@ public class SyncDataController extends BaseController {
     public void updateSyncData(HttpServletResponse response, String ids) {
         if (StringUtils.isNotBlank(ids)) {
             String[] array = ids.split(",");
-            for (String id:array) {
+            for (String id : array) {
                 SyncDataModel model = new SyncDataModel();
                 model.setId(id);
                 model.setStatus(0);
                 syncDataService.updateSyncData(model);
             }
-            writeString(response,"updateSyncData success");
+            writeString(response, "updateSyncData success");
         } else {
             writeString(response, "updateSyncData fail");
         }
@@ -107,37 +149,35 @@ public class SyncDataController extends BaseController {
     /**
      * 同步mysql的数据
      * 把线上执行的sql拿到区域上面执行
+     *
      * @param response
      * @param sqlRequest
      * @param request
      */
     @RequestMapping(value = "/syncMysqlData", method = RequestMethod.POST)
-    public void updateSyncData(HttpServletResponse response, @RequestBody SqlRequest sqlRequest,HttpServletRequest request,
+    public void updateSyncData(HttpServletResponse response, @RequestBody SqlRequest sqlRequest, HttpServletRequest request,
                                @RequestHeader("Authorization") String token) {
 
-        if (!"3d19960bf3e81e7d816c4f26051c49ba".equals(token))
-        {
-            ExceptionUtils.catchException("The request token is "+ token);
+        if (!"3d19960bf3e81e7d816c4f26051c49ba".equals(token)) {
+            ExceptionUtils.catchException("The request token is " + token);
             writeString(response, "Token is error");
             return;
         }
         try {
             if (sqlRequest != null) {
                 String base64Sql = sqlRequest.getSql();
-                if (StringUtils.isNotEmpty(base64Sql))
-                {
+                if (StringUtils.isNotEmpty(base64Sql)) {
                     String sqlId = sqlRequest.getSqlId();
-                    String sql = new String(Base64.decodeBase64(base64Sql),"utf-8");
-                    System.out.println("sqlId = " + sqlId+" : "+sql);
+                    String sql = new String(Base64.decodeBase64(base64Sql), "utf-8");
+                    System.out.println("sqlId = " + sqlId + " : " + sql);
                     organizationService.execSql(sql);
                 }
             }
-        } catch (Exception e)
-        {
+        } catch (Exception e) {
             writeString(response, "execSyncMysqlData fail");
-            ExceptionUtils.catchException(e,"execSyncMysqlData fail");
+            ExceptionUtils.catchException(e, "execSyncMysqlData fail");
         }
-        writeString(response,"success");
+        writeString(response, "success");
     }
 
 }
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 22eac22..4e703da 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
@@ -370,6 +370,51 @@ public class PatientServiceFacade {
     }
 
     /**
+     * 小程序调用：获取已经领取设备，但是还未同步的数据
+     */
+    public BaseResponse getAlreaRece(){
+        PatientServiceQuery patientQuery = new PatientServiceQuery();
+        //待同步默认不需要同步、1-待同步、2-已同步
+        patientQuery.setSynStatus(1);
+        List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
+        List<String> orders = new ArrayList<>();
+        for(PatientService ps :patientServices){
+            orders.add(ps.getOrderId());
+        }
+
+        BaseResponse baseResponse = new BaseResponse();
+        baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
+        baseResponse.setObject(orders);
+        baseResponse.setErrormsg("成功");
+        return baseResponse;
+    }
+
+    /**
+     * 小程序调用：修改同步状态为已同步
+     *
+     * @param orderIds 订单号集合
+     * @return
+     */
+    public BaseResponse receivePatientService(String orderIds) {
+        PatientServiceQuery patientQuery = new PatientServiceQuery();
+        patientQuery.setSql("and order_id in ("+orderIds+")");
+
+        List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
+        if(CollectionUtils.isNotEmpty(patientServices)){
+            for(PatientService ps :patientServices){
+                ps.setSynStatus(2);
+                patientServiceService.updatePatientService(ps);
+            }
+        }
+
+        BaseResponse baseResponse = new BaseResponse();
+        baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
+        baseResponse.setErrormsg("成功");
+        return baseResponse;
+    }
+
+
+    /**
      * 修改状态为领取
      *
      * @param psId 服务记录Id
@@ -394,6 +439,8 @@ public class PatientServiceFacade {
         }
         //设置为领取状态
         ps.setStatus(2);
+        //同步状态为待同步
+        ps.setSynStatus(1);
         //根据用户id获取医院ID
         ps.setReceiveDate(new Date());
         ps.setReceiveUser(String.valueOf(id));
@@ -444,7 +491,8 @@ public class PatientServiceFacade {
             } catch (InterruptedException e1) {
                 e1.printStackTrace();
             }
-            synPatientService(patientServices);
+            //迭代继续同步
+            // synPatientService(patientServices);
         }
         return true;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
index 8084a77..94e2b5b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
@@ -28,7 +28,7 @@ public class PatientServiceSysFacade implements SysBaseFacade {
     private PatientServiceService patientServiceService;
 
     @Override
-    public BaseResponse sysData(String synForm) {
+    public BaseResponse execute(String synForm) {
         JSONArray jsonArray = JSONArray.fromObject(synForm);
         BaseResponse baseResponse = new BaseResponse();
         for (int i = 0; i < jsonArray.size(); i++) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SysBaseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SysBaseFacade.java
index aeb2f65..732aad6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SysBaseFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SysBaseFacade.java
@@ -8,5 +8,5 @@ import com.lyms.platform.common.result.BaseResponse;
  * @discription
  */
 public interface SysBaseFacade {
-    public BaseResponse sysData(String synForm);
+    public BaseResponse execute(String synForm);
 }
diff --git a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
index 562c72c..71a7b9e 100644
--- a/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
+++ b/platform-operate-api/src/main/resources/spring/applicationContext-quartz.xml
@@ -199,9 +199,9 @@
 				<ref bean="correctSieveOrderTrigger"/>
 				<ref bean="autoInsertIdTrigger"/>
 				<!--乐陵住院系统同步-->
-				<ref bean="synLlHisDataTrigger"/>
+				<!--<ref bean="synLlHisDataTrigger"/>-->
 				<!--乐陵住院启动时执行一次-->
-				<ref bean="rsh_simpleTrigger1" />
+				<!--<ref bean="rsh_simpleTrigger1" />-->
 				<!--<ref bean="qhdFmTrigger"/>-->
 				<!--<ref bean="dzfyFmTrigger"/>-->
 				<!--<ref bean="crisisTrigger"/>-->
-- 
1.8.3.1