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

patient-co-manage/wlyy-manage/pom.xml

@@ -17,8 +17,6 @@
        <springside.version>4.2.3-GA</springside.version>
        <shiro.version>1.2.3</shiro.version>
        <commons-lang3.version>3.3.2</commons-lang3.version>
        <guava.version>17.0</guava.version>
        <jackson.version>2.4.0</jackson.version>
        <java.version>1.8</java.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -95,12 +93,20 @@
        <dependency>
            <groupId>com.google.guava</groupId>
            <artifactId>guava</artifactId>
            <version>${guava.version}</version>
            <version>20.0</version>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
            <artifactId>jackson-databind</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.dataformat</groupId>
            <artifactId>jackson-dataformat-xml</artifactId>
        </dependency>
        <dependency>
            <groupId>com.fasterxml.jackson.module</groupId>
            <artifactId>jackson-module-jaxb-annotations</artifactId>
            <version>${jackson.version}</version>
            <version>2.8.1</version>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
@@ -252,25 +258,7 @@
        <dependency>
            <groupId>org.elasticsearch</groupId>
            <artifactId>elasticsearch</artifactId>
        </dependency>
        <dependency>
            <groupId>org.elasticsearch</groupId>
            <artifactId>elasticsearch</artifactId>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>druid</artifactId>
            <version>1.0.15</version>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>druid</artifactId>
            <version>1.0.15</version>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>druid</artifactId>
            <version>1.0.15</version>
            <version>2.4.4</version>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/config/SpringSecurityConfig.java

@@ -42,6 +42,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
                "/admin/static/prescription/toExcel",
                "/admin/static/wechat/listToExcel",
                "/admin/static/wechat/hosipitaTotalToExcel",
                "/admin/static/healthedu/pushlistToExcel",
                "/admin/static/wechat/townTotalToExcel",
                "/admin/static/pay/signpayToExcel",
                "/admin/static/pay/prescriptionToExcel",

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/datastatic/HealthEduController.java

@@ -3,7 +3,6 @@ package com.yihu.wlyy.controller.manager.datastatic;
import com.yihu.wlyy.controller.BaseController;
import com.yihu.wlyy.entity.SignFamily;
import com.yihu.wlyy.service.healthedu.HealthEduService;
import com.yihu.wlyy.vo.SignPayVO;
import jxl.Workbook;
import jxl.write.*;
import org.springframework.beans.factory.annotation.Autowired;
@@ -58,11 +57,7 @@ public class HealthEduController extends BaseController {
			WritableSheet ws;
			ws = wwb.createSheet("sheet",1);
			
			String[] header = {"业务支付流水号","签约号","支付时间","患者", "身份证","患者code",
					"openID", "主体社保卡", "实际社保卡","签约医院","交易总金额，单位分",
					"自费金额，单位分","医保支付金额，单位分","交易状态0 成功 1 失败款",
					"民政补助金额","个人现金支付","个人账户支付",
					"健康账户支付","保健基金支付","本次报销总额","公务员补助"};
			String[] header = {"居民姓名","居民身份证号","居民社保卡号","签约社区", "签约社区CODE"};
			int k = 0;
			for (String h : header) {
				addCell(ws, 0, k, h);//表名，行，列，header
@@ -70,28 +65,12 @@ public class HealthEduController extends BaseController {
			}
			
			int i = 1;
			for (SignPayVO m : (List<SignPayVO>) ls) {
				addCell(ws, i, 0, m.getCode(),"");
				addCell(ws, i, 1, m.getCharge_relation(),"");
				addCell(ws, i, 2, m.getCreate_time(),"");
				addCell(ws, i, 3, m.getName(),"");
				addCell(ws, i, 4, m.getId_no(),"");
				addCell(ws, i, 5, m.getPatient(),"");
				addCell(ws, i, 6, m.getOpenid(),"");
				addCell(ws, i, 7, m.getSsc(),"");
				addCell(ws, i, 8, m.getPrincipal_ssc(),"");
				addCell(ws, i, 9, m.getHospital_name(),"");
				addCell(ws, i, 10, m.getTotal_amount(),"");
				addCell(ws, i, 11, m.getSelfpay_amount(),"");
				addCell(ws, i, 12, m.getInsurance_amount(),"");
				addCell(ws, i, 13, m.getTrade_status(),"");
				addCell(ws, i, 14, m.getCivil_pay(),"");
				addCell(ws, i, 15, m.getSelf_pay(),"");
				addCell(ws, i, 16, m.getAccount_pay(),"");
				addCell(ws, i, 17, m.getHeath_pay(),"");
				addCell(ws, i, 18, m.getHealth_care_pay(),"");
				addCell(ws, i, 19, m.getMi_total_fee(),"");
				addCell(ws, i, 20, m.getCadres_pay(),"");
			for (SignFamily m : (List<SignFamily>) ls) {
				addCell(ws, i, 0, m.getName(),"");
				addCell(ws, i, 1, m.getIdcard(),"");
				addCell(ws, i, 2, m.getSsc(),"");
				addCell(ws, i, 3, m.getHospitalName(),"");
				addCell(ws, i, 4, m.getHospital(),"");
				i++;
			}
			wwb.write();

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/es/HealthEduPatientCode.java

@@ -0,0 +1,18 @@
package com.yihu.wlyy.entity.es;
/**
 * @author huangwenjie
 * @date 2018/2/2 17:15
 */
public class HealthEduPatientCode {
	
	private String patientCode; // 患者标识（ES）（根据userType的值，userType=1，必填；userType=2，为空）
	
	public String getPatientCode() {
		return patientCode;
	}
	
	public void setPatientCode(String patientCode) {
		this.patientCode = patientCode;
	}
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/healthedu/HealthEduService.java

@@ -1,12 +1,21 @@
package com.yihu.wlyy.service.healthedu;
import com.yihu.wlyy.entity.Patient;
import com.yihu.wlyy.entity.SignFamily;
import com.yihu.wlyy.entity.es.HealthEduArticleES;
import com.yihu.wlyy.entity.es.HealthEduPatientCode;
import com.yihu.wlyy.entity.organization.HospitalMapping;
import com.yihu.wlyy.repository.organization.HospitalMappingDao;
import com.yihu.wlyy.service.manager.sign.FamilyContractService;
import com.yihu.wlyy.util.ElasticsearchUtil;
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;
import java.util.Map;
/**
 * 健康教育业务层代码
@@ -21,13 +30,37 @@ public class HealthEduService {
	private String esIndex;
	@Autowired
	private ElasticsearchUtil elasticsearchUtil;
	@Autowired
	private FamilyContractService familyContractService;
	@Autowired
	private HospitalMappingDao hospitalMappingDao;
	
	public List<SignFamily> getPatientPushList(String beginDate, String endDate){
		
		String sql = "SELECT patientCode FROM health_edu_article_patient where createTime >='"+beginDate+"T00:00:00+0800' and createTime <='"+endDate+"T23:59:59+0800'  group by patientCode limit 0,1000000";
		List<SignFamily> signFamilies = new ArrayList<>();
		
		Map<String,String> orgcodemap = new HashMap<>();
		
		String sql = "SELECT patientCode FROM "+esType+" where createTime >='"+beginDate+"T00:00:00+0800' and createTime <='"+endDate+"T23:59:59+0800'  group by patientCode limit 0,1000000";
		
		List<HealthEduPatientCode> patientCodes = elasticsearchUtil.excute(sql, HealthEduPatientCode.class, esIndex, esType);
		
		List<String> patientCodes = elasticsearchUtil.excute(sql, String.class, esIndex, esType);
		return null;
		for (HealthEduPatientCode es: patientCodes) {
			SignFamily obj = familyContractService.findSignByPatient(es.getPatientCode());
			if( obj == null){
				continue;
			}
			String jworgcode = "";
			if(orgcodemap.isEmpty() || !orgcodemap.keySet().contains(obj.getHospital())){
				HospitalMapping hospitalMapping =  hospitalMappingDao.findByCode(obj.getHospital());
				jworgcode = hospitalMapping.getMappingCode();
				orgcodemap.put(obj.getHospital(),jworgcode);
			}else{
				jworgcode = orgcodemap.get(obj.getHospital());
			}
			obj.setHospital(jworgcode);
			signFamilies.add(obj);
		}
		return signFamilies;
	}
}

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/static/static_healthedu_js.jsp

@@ -62,8 +62,8 @@
                    //签约支付报表导出
                    me.$btnExportSign.on('click',function () {
                        var values = me.$element.Fields.getValues();
                        values.beginDate = values.beginDate + ' 00:00:00';
                        values.endDate = values.endDate + ' 23:59:59';
                        values.beginDate = values.beginDate;
                        values.endDate = values.endDate;
                        //定义一个form表单
                        var myform = $("<form></form>");