From ec9ccaa0756fbfcfae83513d00a744184f596067 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 18 Sep 2017 15:40:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E9=80=9AVIP=E5=A2=9E=E5=80=BC?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mainOrm/master/PatientMarkHospital.xml   |  5 ++++-
 .../main/java/com/lyms/hospitalapi/llfy/LlfyHisService.java | 13 ++++++-------
 .../operate/web/controller/PatientServiceController.java    |  9 +++++----
 .../operate/web/facade/PatientMarkHospServiceFacade.java    | 12 +++++++++++-
 4 files changed, 26 insertions(+), 13 deletions(-)

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 33ad3f5..e13c936 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientMarkHospital.xml
@@ -231,6 +231,9 @@
             <if test="hospitDate != null">
                 and hospit_date = #{hospitDate,jdbcType=TIMESTAMP}
             </if>
+            <if test="hospitType != null">
+                and hospit_type = #{hospitType,jdbcType=INTEGER}
+            </if>
         </where>
     </sql>
 
@@ -238,7 +241,7 @@
     <select id="queryPatientMarkHospital" resultMap="PatientMarkHospitalResultMap"
             parameterType="com.lyms.platform.permission.model.PatientMarkHospitalQuery">
         select
-        id,patient_id,pid,back_status,back_result,back_doctor,back_date,back_make_date,back_remark,back_failure,in_hospit_status,in_hospit_result,in_hospit_doctor,in_hospit_date,in_hospit_make_date,in_hospit_remark,in_hospit_failure,make_in_hospit_date,make_date,make_doctor,make_remark,hospital_id,hospit_status,hospit_date
+        id,patient_id,pid,back_status,back_result,back_doctor,back_date,back_make_date,back_remark,back_failure,in_hospit_status,in_hospit_result,in_hospit_doctor,in_hospit_date,in_hospit_make_date,in_hospit_remark,in_hospit_failure,make_in_hospit_date,make_date,make_doctor,make_remark,hospital_id,hospit_status,hospit_date,hospit_type
         from patient_mark_hospital
         <include refid="PatientMarkHospitalCondition"/>
         <include refid="orderAndLimit"/>
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyHisService.java
index ed225e5..6375171 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyHisService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/llfy/LlfyHisService.java
@@ -1,9 +1,9 @@
 package com.lyms.hospitalapi.llfy;
 
-import com.lyms.hospitalapi.pojo.PregPatientinfo;
+import com.lyms.hospitalapi.pojo.LcfyPatient;
+import com.lyms.platform.pojo.Patients;
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.handlers.BeanListHandler;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import java.sql.Connection;
@@ -17,15 +17,14 @@ import java.util.Map;
  */
 @Service("llfyHisService")
 public class LlfyHisService {
-    public Map<String,Object> getPatientInfo(String cardNo) {
-        if (StringUtils.isNotBlank(cardNo)) {
-            Connection conn = com.lyms.hospitalapi.fnfy.ConnTools.makeHisConnection();
+    public Map<String,Object> getPatientInfo(Patients ps,String startDate,String endDate) {
+            Connection conn = com.lyms.hospitalapi.llfy.ConnTools.makeHisConnection();
             QueryRunner queryRunner = new QueryRunner();
             try {
-                List<PregPatientinfo> list = queryRunner.query(conn, "select top 1 brid as P_ID,jzkh as P_CARDNO,hzxm as P_NAME, hzxb as P_SEX, hzcsrq as P_BIRTHDAY, sfzhm as P_IDNUM, hz_lxdh as P_MOBILEPHONE from fvw_住院病人档案 where jzkh= '" + cardNo + "'", new BeanListHandler<PregPatientinfo>(PregPatientinfo.class));
+                List<LcfyPatient> list = queryRunner.query(conn, "select 入院日期 as inHospDate,入院诊断 as inHospDiagn from fvw_住院病人档案 where (姓名= '"+ps.getUsername()+"' and 证件号 ='"+ps.getCardNo()+"') or (姓名='"+ps.getUsername()+"' and 手机号 ='"+ps.getPhone()+"')  or (姓名='"+ps.getUsername()+"' and 就诊卡='"+ps.getVcCardNo()+"') and 入院日期 is not null and 入院日期 between '"+startDate+"' and '"+endDate+"'", new BeanListHandler<LcfyPatient>(LcfyPatient.class));
             } catch (Exception e) {
+
             }
-        }
             return  null;
     }
 }
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 24333bc..c324bf4 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
@@ -67,11 +67,12 @@ public class PatientServiceController extends BaseController {
     @RequestMapping(value = "/patSer", method = RequestMethod.POST)
     public BaseResponse addOrUpdatePatientService(PatientService ps, HttpServletRequest request) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        BaseResponse baseResponse = validatePatient(ps);
-        if(baseResponse.getErrorcode()!=ErrorCodeConstants.SUCCESS){
-            return  baseResponse;
-        }
+
         if (StringUtils.isEmpty(ps.getId())) {
+            BaseResponse baseResponse = validatePatient(ps);
+            if(baseResponse.getErrorcode()!=ErrorCodeConstants.SUCCESS){
+                return  baseResponse;
+            }
             return patientServiceFacade.addPatientService(ps, loginState.getId());
         } else {
             return patientServiceFacade.updatePatientService(ps, loginState.getId());
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 32814f4..0e02165 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
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.facade;
 
+import com.lyms.hospitalapi.llfy.LlfyHisService;
 import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.MakeHospitalEnums;
@@ -22,6 +23,7 @@ import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import javax.annotation.Resource;
 import java.util.*;
 
 /**
@@ -42,6 +44,8 @@ public class PatientMarkHospServiceFacade {
     private UsersService usersService;
     @Autowired
     private PatientsService patientsService;
+    @Resource(name = "llfyHisService")
+    private LlfyHisService llfyHisService;
 
     /**
      * 初始化接口
@@ -313,6 +317,9 @@ public class PatientMarkHospServiceFacade {
 
         List<PatientMarkHospital> patientMarkHospitals = patientMarkHospitalService.queryPatientMarkHospital(patientMarkHospQuery);
         for (PatientMarkHospital ps : patientMarkHospitals) {
+            if(ps.getHospitType() == 1){//分娩住院跳过
+                continue;
+            }
             synUpdateHisData(ps);
         }
         if(patientMarkHospQuery.getCount()>page*100){
@@ -325,7 +332,10 @@ public class PatientMarkHospServiceFacade {
      * @param ps
      */
     public void synUpdateHisData(PatientMarkHospital ps){
-
+        Patients patients = patientsService.findOnePatientById(ps.getPatientId());
+        if (null != patients) {
+            llfyHisService.getPatientInfo(patients,DateUtil.getyyyy_MM_dd(ps.getMakeDate()),DateUtil.getyyyy_MM_dd(new Date()));
+        }
     }
 
     public static Map<String, Integer> initHospitType() {
-- 
1.8.3.1