Merge branch 'dev' of humingfen/patient-co-management into dev

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/event/ApplicationEvent.java

@@ -255,6 +255,15 @@ public class ApplicationEvent implements ApplicationListener<ContextRefreshedEve
            new Thread(redisThread).start();
            logger.info("redis message end");
            //慢病患者医疗保险号同步，每天6点执行一次
            if (!quartzHelper.isExistJob("patient_medicare_number_job")) {
                String trigger = SystemConf.getInstance().getSystemProperties().getProperty("patient_medicare_number_job");
                quartzHelper.addJob(PatientMedicareNumberJob.class, trigger, "patient_medicare_number_job", new HashMap<String, Object>());
                logger.info("patient_medicare_number_job  job success");
            } else {
                logger.info("patient_medicare_number_job  job exist");
            }
        } catch (Exception e) {
            logger.info("sign end job start failed");
        }

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/job/PatientMedicareNumberJob.java

@@ -0,0 +1,34 @@
package com.yihu.wlyy.job;
import com.yihu.wlyy.service.third.jw.JwPatientMedicareNumberService;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
/**
 * 慢病患者医疗保险号同步JOB
 * @author humingfen
 * @date 2018/5/22
 */
public class PatientMedicareNumberJob implements Job {
    private static final Logger logger = LoggerFactory.getLogger(PatientMedicareNumberJob.class);
    @Autowired
    private JwPatientMedicareNumberService jwPatientMedicareNumberService;
    @Override
    public void execute(JobExecutionContext context) throws JobExecutionException
    {
        logger.info("START=====开始更新慢病患者医疗保险号的JOB");
        try {
            jwPatientMedicareNumberService.getEffectiveSignFamily();
        }catch (Exception e) {
            e.printStackTrace();
            logger.info("END===ERROR===开始更新慢病混着医疗保险号JOB,message:" +
                    e.getMessage());
        }
    }
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/repository/organization/HospitalDao.java

@@ -43,4 +43,7 @@ public interface HospitalDao extends PagingAndSortingRepository<Hospital, Long>,
	@Query("select p from Hospital p where p.city = ?1 and p.del='1' and p.level =2 and p.centerSite='00'")
	List<Hospital> findByCity(String city);
	@Query("select distinct p.code from Hospital p")
	List<String> findCode();
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/repository/patient/PatientDao.java

@@ -79,4 +79,5 @@ public interface PatientDao extends PagingAndSortingRepository<Patient, Long> {
    @Query(value = "SELECT DISTINCT openid FROM `wlyy_patient` WHERE `openid` IS NOT NULL AND `openid` <> ' ' AND `openid` <> 'undefined' " +
            " AND `sicard_status` IS NULL AND `sicard_time` >= ?1 ORDER BY `sicard_time`",nativeQuery = true)
    List<String> listNotupdatedByDate(String beginTime);
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/repository/patient/SignFamilyDao.java

@@ -5,20 +5,17 @@
 *******************************************************************************/
package com.yihu.wlyy.repository.patient;
import java.util.Date;
import java.util.List;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.entity.patient.SignFamilyRenew;
import com.yihu.wlyy.entity.patient.SignFamily;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import com.yihu.wlyy.entity.patient.SignFamily;
import java.util.Date;
import java.util.List;
public interface SignFamilyDao extends PagingAndSortingRepository<SignFamily, Long>, JpaSpecificationExecutor<SignFamily> {
@@ -431,4 +428,8 @@ public interface SignFamilyDao extends PagingAndSortingRepository<SignFamily, Lo
    @Query(value = "SELECT f.* FROM wlyy_sign_family f WHERE f.idcard = ?1 and f.`status` = -4 ORDER BY sign_year desc LIMIT 0,1 ",nativeQuery = true)
    SignFamily findLatelyRenew(String idcard);
    //查询wlyy_sign_family有效签约且居民的医疗保险号为空的数据
    @Query(value = "select a.idcard from wlyy_sign_family a left join wlyy_patient b on a.idcard = b.idcard where a.hospital = ?1 and (a.type = 2 or a.type = 1) " +
            "and a.status = 1 and a.expenses_status = 1 and (b.medicare_number is null or b.medicare_number = '')", nativeQuery = true)
    List<String> findIdcardByStatus(String hospital);
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/common/account/PatientService.java

@@ -1138,4 +1138,32 @@ public class PatientService extends TokenService {
        }
        return "1";
    }
    /**
     * 根据患者身份证号更新患者医疗保险号情况
     * @param idcard_medicare_number_map
     */
    @Transactional
    public void updatePatientMedicareNumberByIdcard(HashMap<String, String> idcard_medicare_number_map){
        DefaultTransactionDefinition def = new DefaultTransactionDefinition();
        def.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); // 事物隔离级别，开启新事务
        TransactionStatus status = transactionManager.getTransaction(def); // 获得事务状态
        try {
            for (String idcard : idcard_medicare_number_map.keySet()) {
                patientDao.updatePatientMedicareNumberByIdcard(idcard,idcard_medicare_number_map.get(idcard));
            }
            //事务提交
            transactionManager.commit(status);
        } catch (Exception ex) {
            logger.info("更新患者医疗保险号出错，从基卫获取的患者数据为：START");
            for (String idcard : idcard_medicare_number_map.keySet()) {
                logger.info("idcard:" + idcard);
                logger.info("idcard:" + idcard_medicare_number_map.get(idcard));
            }
            logger.info("更新患者医疗保险号出错，从基卫获取的患者数据为：END");
            //报错事务回滚
            transactionManager.rollback(status);
        }
    }
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/third/jw/JwPatientMedicareNumberService.java

@@ -0,0 +1,52 @@
package com.yihu.wlyy.service.third.jw;
import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.util.HttpClientUtil;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
/**
 * 基位签约信息接口
 * Created by humingfen on 2018/5/22.
 */
@Service
public class JwPatientMedicareNumberService {
    private static final Logger logger = LoggerFactory.getLogger(JwPatientMedicareNumberService.class);
    //基卫服务地址
    @Value("${sign.zysoft}")
    private String jwUrl;
    @Autowired
    private HospitalDao hospitalDao;
    @Autowired
    private SignFamilyDao signFamilyDao;
    @Autowired
    private HttpClientUtil httpClientUtil;
    /**
     * 根据社区查找有效签约居民的签约信息，并同步到本地数据库
     */
    public void getEffectiveSignFamily () throws Exception {
        List<String> hospitals = hospitalDao.findCode();
        for(String hospital : hospitals) {
            List<String> idcards = signFamilyDao.findIdcardByStatus(hospital);
            String url = jwUrl + "/third/zysoftservice/getSickCurrnetFamilySignInfo";
            //医疗保险号的居民集合
            HashMap<String, String> idcard_medicare_number_map = new HashMap<>();
            for (String idcard : idcards) {
                List<NameValuePair> params = new ArrayList<>();
                params.add(new BasicNameValuePair("idcard", idcard));
                httpClientUtil.post(url, params, "UTF-8");
            }
        }
    }
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/web/quota/JobController.java

@@ -777,4 +777,20 @@ public class JobController extends BaseController {
        }
    }
    /**
     *立即执行慢病患者医疗保险号同步
     *@author humingfen
     *@date 2018/5/23
     */
    @RequestMapping(value = "/executePatientMedicareNumberJob", method = RequestMethod.POST)
    @ApiOperation("立即执行前一天的慢病患者医疗保险号同步")
    public String executePatientMedicareNumberJob() {
        try {
            quartzHelper.startNow(PatientMedicareNumberJob.class, UUID.randomUUID().toString(), null);
            return write(200, "启动成功");
        } catch (Exception e) {
            error(e);
            return error(-1, e.getMessage());
        }
    }
}

patient-co/patient-co-wlyy-job/src/main/resources/application-dev.yml

@@ -90,7 +90,7 @@ images:
sign:
  check_upload: http://172.19.103.88:8011/wlyy_service
  zysoft: http://59.61.92.90:8072/wlyy_sign
quartz:
  name: schedulerFactoryBean_dev

patient-co/patient-co-wlyy-job/src/main/resources/application-devtest.yml

@@ -86,7 +86,7 @@ images:
sign:
  check_upload: http://172.19.103.88:8011/wlyy_service
  zysoft: http://59.61.92.90:8072/wlyy_sign
quartz:
  name: schedulerFactoryBean_test_dev

patient-co/patient-co-wlyy-job/src/main/resources/application-prod.yml

@@ -88,7 +88,7 @@ images:
sign:
  check_upload: http://59.61.92.90:8087/wlyy_service
  zysoft: http://59.61.92.90:8072/wlyy_sign
quartz:

patient-co/patient-co-wlyy-job/src/main/resources/system.properties

@@ -134,6 +134,9 @@ doctor_prenatal_inspector_job=0 0 10 ? * MON-FRI
#续方订单自动确认job
patient_confirm_receipt_job=00 0 8,12,18,21 * * ?
# 病患者医疗保险号同步JOB (每天6点执行一次)
patient_medicare_number_job=0 0 6 * * ?
#统一支付平台支付成功后页面跳转地址
return_url={server}/wx/html/qygl/html/pay_result.html
#统一支付平台支付接口地址