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

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

@@ -43,6 +43,8 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
                "/admin/static/wechat/listToExcel",
                "/admin/static/wechat/hosipitaTotalToExcel",
                "/admin/static/wechat/townTotalToExcel",
                "/admin/static/pay/signpayToExcel",
                "/admin/static/pay/prescriptionToExcel",
                "/admin/basedata/importData",
                "/admin/wlyyUserRole/importData",
                "/WEB—INF/views/**"

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

@@ -0,0 +1,203 @@
package com.yihu.wlyy.controller.manager.datastatic;
import com.yihu.wlyy.controller.BaseController;
import com.yihu.wlyy.entity.prescription.PrescriptionPayVO;
import com.yihu.wlyy.entity.wechat.WechatSignVO;
import com.yihu.wlyy.service.manager.sign.SignFamilyService;
import com.yihu.wlyy.service.prescription.PrescriptionService;
import com.yihu.wlyy.vo.SignPayVO;
import jxl.Workbook;
import jxl.write.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.util.List;
/**
 * 支付统计报表导出
 * @author huangwenjie
 * @date 2017/12/12 20:20
 */
@Controller
@RequestMapping(value = "/admin/static/pay")
public class PayStaticController extends BaseController {
	
	@Autowired
	private SignFamilyService signFamilyService;
	
	@Autowired
	private PrescriptionService prescriptionService;
	
	//页面跳转（主页面）
	@RequestMapping(value = "initial")
	public String listInit() {
		return "static/static_pay";
	}
	
	//导出签约支付报表
	@RequestMapping(value="signpayToExcel",method = RequestMethod.POST,produces = "application/json;charset=UTF-8" )
	public void signPayExport(
			@RequestParam(value = "beginDate",required = false)String beginDate,
			@RequestParam(value = "endDate",required = false)String endDate,
			HttpServletResponse response){
		try {
			List<SignPayVO> datalist = signFamilyService.geSignPayDataList(beginDate,endDate);
			response.setContentType("octets/stream");
			response.setHeader("Content-Disposition", "attachment; filename="+ new String( "signPayDataList.xls"));
			OutputStream os = response.getOutputStream();
			this.signPayWrite(os,datalist);
		}catch (Exception ex){
			error(ex);
		}
	}
	
	//导出长处方支付报表
	@RequestMapping(value="prescriptionToExcel",method = RequestMethod.POST,produces = "application/json;charset=UTF-8" )
	public void prescriptionPayExport(
			@RequestParam(value = "beginDate",required = false)String beginDate,
			@RequestParam(value = "endDate",required = false)String endDate,
			HttpServletResponse response){
		try {
			List<PrescriptionPayVO> datalist = prescriptionService.getPrescriptionPayDataList(beginDate,endDate);
			response.setContentType("octets/stream");
			response.setHeader("Content-Disposition", "attachment; filename="+ new String( "prescriptionPayDataList.xls"));
			OutputStream os = response.getOutputStream();
			this.prescriptionPayWrite(os,datalist);
		}catch (Exception ex){
			error(ex);
		}
	}
	
	public void prescriptionPayWrite(OutputStream os, List ls) throws Exception{
		WritableWorkbook wwb = Workbook.createWorkbook(os);
		try {
			WritableSheet ws;
			ws = wwb.createSheet("sheet",1);
			
			String[] header = {"业务支付流水号","续方号","支付时间","患者", "身份证","签约社区",
					"openID", "主体社保卡","实际社保卡","交易总金额 单位分",
					"医保支付金额，单位分","自付金额，单位分","交易状态 成功1 失败0",
					"本次报销总额 单位分","个人现金支付，单位分",
					"个人账户支付，单位分","健康账户支付，单位分","公务员补助，单位分",
					"基金支付，单位分","保健基金支付，单位分","商业保险支付，单位分",
					"共济账户支付，单位分","民政补助金额，单位分","乙类支付金额，单位分",
					"非医保费用，单位分","超封顶线金额，单位分","个人账户余额，单位分","健康账户余额，单位分"};
			int k = 0;
			for (String h : header) {
				addCell(ws, 0, k, h);//表名，行，列，header
				k++;
			}
			
			int i = 1;
			for (PrescriptionPayVO m : (List<PrescriptionPayVO>) ls) {
				addCell(ws, i, 0, m.getCode(),"");
				addCell(ws, i, 1, m.getPrescription_code(),"");
				addCell(ws, i, 2, m.getCreate_time(),"");
				addCell(ws, i, 3, m.getUser_name(),"");
				addCell(ws, i, 4, m.getId_no(),"");
				addCell(ws, i, 5, m.getHospital_name(),"");
				addCell(ws, i, 6, m.getOpenid(),"");
				addCell(ws, i, 7, m.getCard_no(),"");
				addCell(ws, i, 8, m.getPrincipal_card_no(),"");
				addCell(ws, i, 9, m.getTotal_amount(),"");
				addCell(ws, i, 10, m.getInsurance_amount(),"");
				addCell(ws, i, 11, m.getSelf_pay_amount(),"");
				addCell(ws, i, 12, m.getTrade_status(),"");
				addCell(ws, i, 13, m.getMi_total_fee(),"");
				addCell(ws, i, 14, m.getSelf_pay(),"");
				addCell(ws, i, 15, m.getAccount_pay(),"");
				addCell(ws, i, 16, m.getHeath_pay(),"");
				addCell(ws, i, 17, m.getCadres_pay(),"");
				addCell(ws, i, 18, m.getFund_pay(),"");
				addCell(ws, i, 19, m.getHealth_care_pay(),"");
				addCell(ws, i, 20, m.getCommerce_pay(),"");
				addCell(ws, i, 21, m.getFamily_pay(),"");
				addCell(ws, i, 22, m.getCivil_pay(),"");
				addCell(ws, i, 23, m.getBdrug_pay(),"");
				addCell(ws, i, 24, m.getUnless_amount(),"");
				addCell(ws, i, 25, m.getExceed_amount(),"");
				addCell(ws, i, 26, m.getAccount_balance(),"");
				addCell(ws, i, 27, m.getHealth_balance(),"");
				i++;
			}
			wwb.write();
			wwb.close();
		} catch (IOException e) {
			e.printStackTrace();
			if (wwb != null) wwb.close();
			throw e;
		}
	}
	
	public void signPayWrite(OutputStream os, List ls) throws Exception{
		WritableWorkbook wwb = Workbook.createWorkbook(os);
		try {
			WritableSheet ws;
			ws = wwb.createSheet("sheet",1);
			
			String[] header = {"业务支付流水号","签约号","支付时间","患者", "身份证","患者code",
					"openID", "主体社保卡", "实际社保卡","签约医院","交易总金额，单位分",
					"自费金额，单位分","医保支付金额，单位分","交易状态0 成功 1 失败款",
					"民政补助金额","个人现金支付","个人账户支付",
					"健康账户支付","保健基金支付","本次报销总额","公务员补助"};
			int k = 0;
			for (String h : header) {
				addCell(ws, 0, k, h);//表名，行，列，header
				k++;
			}
			
			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(),"");
				i++;
			}
			wwb.write();
			wwb.close();
		} catch (IOException e) {
			e.printStackTrace();
			if (wwb != null) wwb.close();
			throw e;
		}
	}
	//添加单元格内容
	public void addCell(WritableSheet ws, int row, int column,  String data) throws WriteException {
		Label label = new Label(column ,row, data);
		ws.addCell(label);
	}
	//添加单元格内容
	public void addCell(WritableSheet ws, int row, int column, String data, String memo) throws WriteException {
		Label label = new Label(column ,row, data);
		if(!org.springframework.util.StringUtils.isEmpty(memo)){
			WritableCellFeatures cellFeatures = new WritableCellFeatures();
			cellFeatures.setComment(memo);
			label.setCellFeatures(cellFeatures);
		}
		ws.addCell(label);
	}
}

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

@@ -1,7 +1,6 @@
package com.yihu.wlyy.controller.manager.datastatic;
import com.yihu.wlyy.controller.BaseController;
import com.yihu.wlyy.entity.prescription.PrescriptionVO;
import com.yihu.wlyy.entity.wechat.WechatSignVO;
import com.yihu.wlyy.entity.wechat.WechatTotalVO;
import com.yihu.wlyy.service.wechat.WechatService;
@@ -16,7 +15,6 @@ import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
/**
@@ -137,13 +135,12 @@ public class WeChatStaticController extends BaseController {
				addCell(ws, i, 3, m.getOpenid_time(),"");
				addCell(ws, i, 4, m.getIdcard(),"");
				addCell(ws, i, 5, m.getDoctor_name(),"");
				addCell(ws, i, 6, m.getDoctor_name(),"");
				addCell(ws, i, 7, m.getDoctor_health_name(),"");
				addCell(ws, i, 8, m.getHospital_name(),"");
				addCell(ws, i, 9, m.getSick_village_name(),"");
				addCell(ws, i, 10, m.getAddress(),"");
				addCell(ws, i, 11, m.getStreet_name(),"");
				addCell(ws, i, 12, m.getTcount(),"");
				addCell(ws, i, 6, m.getDoctor_health_name(),"");
				addCell(ws, i, 7, m.getHospital_name(),"");
				addCell(ws, i, 8, m.getSick_village_name(),"");
				addCell(ws, i, 9, m.getAddress(),"");
				addCell(ws, i, 10, m.getStreet_name(),"");
				addCell(ws, i, 11, m.getTcount(),"");
				i++;
			}
			wwb.write();

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/prescription/PrescriptionPayVO.java

@@ -0,0 +1,262 @@
package com.yihu.wlyy.entity.prescription;
/**
 * 长处方支付VO类
 * @author huangwenjie
 * @date 2017/12/13 09:03
 */
public class PrescriptionPayVO {
	
	private String code;
	private String prescription_code;
	private String create_time;
	private String user_name;
	private String id_no;
	private String hospital_name;
	private String openid;
	private String card_no;
	private String principal_card_no;
	private String total_amount;
	private String insurance_amount;
	private String self_pay_amount;
	private String trade_status;
	private String mi_total_fee;
	private String self_pay;
	private String account_pay;
	private String heath_pay;
	private String cadres_pay;
	private String fund_pay;
	private String health_care_pay;
	private String commerce_pay;
	private String family_pay;
	private String civil_pay;
	private String bdrug_pay;
	private String unless_amount;
	private String exceed_amount;
	private String account_balance;
	private String health_balance;
	
	public String getCode() {
		return code;
	}
	
	public void setCode(String code) {
		this.code = code;
	}
	
	public String getPrescription_code() {
		return prescription_code;
	}
	
	public void setPrescription_code(String prescription_code) {
		this.prescription_code = prescription_code;
	}
	
	public String getCreate_time() {
		return create_time;
	}
	
	public void setCreate_time(String create_time) {
		this.create_time = create_time;
	}
	
	public String getUser_name() {
		return user_name;
	}
	
	public void setUser_name(String user_name) {
		this.user_name = user_name;
	}
	
	public String getId_no() {
		return id_no;
	}
	
	public void setId_no(String id_no) {
		this.id_no = id_no;
	}
	
	public String getHospital_name() {
		return hospital_name;
	}
	
	public void setHospital_name(String hospital_name) {
		this.hospital_name = hospital_name;
	}
	
	public String getOpenid() {
		return openid;
	}
	
	public void setOpenid(String openid) {
		this.openid = openid;
	}
	
	public String getCard_no() {
		return card_no;
	}
	
	public void setCard_no(String card_no) {
		this.card_no = card_no;
	}
	
	public String getPrincipal_card_no() {
		return principal_card_no;
	}
	
	public void setPrincipal_card_no(String principal_card_no) {
		this.principal_card_no = principal_card_no;
	}
	
	public String getTotal_amount() {
		return total_amount;
	}
	
	public void setTotal_amount(String total_amount) {
		this.total_amount = total_amount;
	}
	
	public String getInsurance_amount() {
		return insurance_amount;
	}
	
	public void setInsurance_amount(String insurance_amount) {
		this.insurance_amount = insurance_amount;
	}
	
	public String getSelf_pay_amount() {
		return self_pay_amount;
	}
	
	public void setSelf_pay_amount(String self_pay_amount) {
		this.self_pay_amount = self_pay_amount;
	}
	
	public String getTrade_status() {
		return trade_status;
	}
	
	public void setTrade_status(String trade_status) {
		this.trade_status = trade_status;
	}
	
	public String getMi_total_fee() {
		return mi_total_fee;
	}
	
	public void setMi_total_fee(String mi_total_fee) {
		this.mi_total_fee = mi_total_fee;
	}
	
	public String getSelf_pay() {
		return self_pay;
	}
	
	public void setSelf_pay(String self_pay) {
		this.self_pay = self_pay;
	}
	
	public String getAccount_pay() {
		return account_pay;
	}
	
	public void setAccount_pay(String account_pay) {
		this.account_pay = account_pay;
	}
	
	public String getHeath_pay() {
		return heath_pay;
	}
	
	public void setHeath_pay(String heath_pay) {
		this.heath_pay = heath_pay;
	}
	
	public String getCadres_pay() {
		return cadres_pay;
	}
	
	public void setCadres_pay(String cadres_pay) {
		this.cadres_pay = cadres_pay;
	}
	
	public String getFund_pay() {
		return fund_pay;
	}
	
	public void setFund_pay(String fund_pay) {
		this.fund_pay = fund_pay;
	}
	
	public String getHealth_care_pay() {
		return health_care_pay;
	}
	
	public void setHealth_care_pay(String health_care_pay) {
		this.health_care_pay = health_care_pay;
	}
	
	public String getCommerce_pay() {
		return commerce_pay;
	}
	
	public void setCommerce_pay(String commerce_pay) {
		this.commerce_pay = commerce_pay;
	}
	
	public String getFamily_pay() {
		return family_pay;
	}
	
	public void setFamily_pay(String family_pay) {
		this.family_pay = family_pay;
	}
	
	public String getCivil_pay() {
		return civil_pay;
	}
	
	public void setCivil_pay(String civil_pay) {
		this.civil_pay = civil_pay;
	}
	
	public String getBdrug_pay() {
		return bdrug_pay;
	}
	
	public void setBdrug_pay(String bdrug_pay) {
		this.bdrug_pay = bdrug_pay;
	}
	
	public String getUnless_amount() {
		return unless_amount;
	}
	
	public void setUnless_amount(String unless_amount) {
		this.unless_amount = unless_amount;
	}
	
	public String getExceed_amount() {
		return exceed_amount;
	}
	
	public void setExceed_amount(String exceed_amount) {
		this.exceed_amount = exceed_amount;
	}
	
	public String getAccount_balance() {
		return account_balance;
	}
	
	public void setAccount_balance(String account_balance) {
		this.account_balance = account_balance;
	}
	
	public String getHealth_balance() {
		return health_balance;
	}
	
	public void setHealth_balance(String health_balance) {
		this.health_balance = health_balance;
	}
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/sign/SignFamilyService.java

@@ -1,12 +1,15 @@
package com.yihu.wlyy.service.manager.sign;
import com.yihu.wlyy.entity.*;
import com.yihu.wlyy.entity.wechat.WechatTotalVO;
import com.yihu.wlyy.repository.*;
import com.yihu.wlyy.service.manager.consult.WlyyConsultTeamService;
import com.yihu.wlyy.service.manager.patient.AdminPatientService;
import com.yihu.wlyy.service.manager.team.WlyyAdminTeamService;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.HttpClientUtil;
import com.yihu.wlyy.util.query.BaseJpaService;
import com.yihu.wlyy.vo.SignPayVO;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,6 +17,8 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.PageRequest;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -57,6 +62,9 @@ public class SignFamilyService extends BaseJpaService<SignFamily,Long> {
    @Value("${im-service.im_service_url}")
    private String imUrl;
    
    @Autowired
    JdbcTemplate jdbcTemplate;
    //签约居民管理**********************
@@ -384,4 +392,47 @@ public class SignFamilyService extends BaseJpaService<SignFamily,Long> {
    public SignFamily findByPatientCode(String code) {
        return signFamilyDao.findSignByPatient(code);
    }
    
    /**
     * 根据时间获取签约支付明细
     * @param beginDate
     * @param endDate
     * @return
     */
    public List<SignPayVO> geSignPayDataList(String beginDate, String endDate) {
        List<SignPayVO> list = new ArrayList<>();
        String sql  = "SELECT DISTINCT " +
                "b.`code`," +
                "b.`charge_relation`," +
                "b.`create_time`," +
                "b.`name` ," +
                "b.`id_no` ," +
                "b.`patient` ," +
                "b.`openid` ," +
                "b.`ssc` ," +
                "b.`principal_ssc` ," +
                "b.`hospital_name` ," +
                "b.`total_amount` ," +
                "b.`selfpay_amount` ," +
                "b.`insurance_amount` ," +
                "b.`trade_status` ," +
                "b.`civil_pay` ," +
                "b.`self_pay` ," +
                "b.`account_pay` ," +
                "b.`heath_pay` ," +
                "b.`health_care_pay` ," +
                "b.`mi_total_fee` ," +
                "b.`cadres_pay`  " +
                "FROM wlyy_charge b WHERE b.trade_status='0' ";
        if(StringUtils.isNotBlank(beginDate)){
            sql = sql + "AND b.create_time>='"+beginDate+"' ";
        }
    
        if(StringUtils.isNotBlank(endDate)){
            sql = sql + "AND b.create_time<='"+endDate+"' ";
        }
    
        list =  jdbcTemplate.query(sql,new BeanPropertyRowMapper(SignPayVO.class));
        return list ;
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/prescription/PrescriptionService.java

@@ -1,8 +1,10 @@
package com.yihu.wlyy.service.prescription;
import com.yihu.wlyy.entity.prescription.PrescriptionPayVO;
import com.yihu.wlyy.entity.prescription.PrescriptionVO;
import com.yihu.wlyy.repository.prescription.PrescriptionDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.vo.SignPayVO;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -24,9 +26,6 @@ public class PrescriptionService extends BaseService {
	@Autowired
	JdbcTemplate jdbcTemplate;
	
	@Autowired
	private PrescriptionDao prescriptionDao;
	
	private static Logger logger = LoggerFactory.getLogger(PrescriptionService.class);
	
	public List<PrescriptionVO> getPrescriptionList(String hospital,
@@ -57,6 +56,7 @@ public class PrescriptionService extends BaseService {
					"WHEN 60 THEN '配药成功/待配送' " +
					"WHEN 65 THEN '配送中' " +
					"WHEN 100 THEN '配送到患者手中/已完成' " +
					"WHEN-5 THEN '线下取消' " +
					"WHEN-4 THEN '线下退费' " +
					"WHEN-3 THEN '支付超时' " +
					"WHEN-2 THEN '患者自己取消' " +
@@ -111,12 +111,12 @@ public class PrescriptionService extends BaseService {
		
		//开始时间
		if (StringUtils.isNotBlank(beginDate) && !" 00:00:00".equals(beginDate)) {
			prescriptionsql = prescriptionsql + " and  p1.create_time <= '" + beginDate+"' ";
			prescriptionsql = prescriptionsql + " and  p1.create_time >= '" + beginDate+"' ";
		}
		
		//结束时间
		if (StringUtils.isNotBlank(endDate) && !" 23:59:59".equals(endDate)) {
			prescriptionsql = prescriptionsql + " and  p1.create_time >= '" + endDate+"' ";
			prescriptionsql = prescriptionsql + " and  p1.create_time <= '" + endDate+"' ";
		}
		
		prescriptionsql = prescriptionsql+ ") p ORDER BY p.create_time DESC";
@@ -125,7 +125,7 @@ public class PrescriptionService extends BaseService {
			if(1 == page){
				page = page-1;
			}
			prescriptionsql = prescriptionsql +" limit " + page+", "+pageSize;
			prescriptionsql = prescriptionsql +" limit " + page*pageSize+", "+pageSize;
		}
		
		list =  jdbcTemplate.query(prescriptionsql,new BeanPropertyRowMapper(PrescriptionVO.class));
@@ -194,4 +194,56 @@ public class PrescriptionService extends BaseService {
		
		return total ;
	}
	
	/**
	 * 根据时间获取长处方支付详情
	 * @param beginDate
	 * @param endDate
	 * @return
	 */
	public List<PrescriptionPayVO> getPrescriptionPayDataList(String beginDate, String endDate) {
		List<PrescriptionPayVO> list = new ArrayList<>();
		String sql  = "SELECT DISTINCT " +
				"b.`code`," +
				"b.`prescription_code`," +
				"b.`create_time`," +
				"b.`user_name`," +
				"b.`id_no`," +
				"p.`hospital_name`," +
				"b.`openid`," +
				"b.`card_no`," +
				"b.`principal_card_no`," +
				"b.`total_amount`," +
				"b.`insurance_amount`," +
				"b.`self_pay_amount`," +
				"b.`trade_status`," +
				"b.`mi_total_fee`," +
				"b.`self_pay`," +
				"b.`account_pay`," +
				"b.`heath_pay`," +
				"b.`cadres_pay`," +
				"b.`fund_pay`," +
				"b.`health_care_pay`," +
				"b.`commerce_pay`," +
				"b.`family_pay`," +
				"b.`civil_pay`," +
				"b.`bdrug_pay`," +
				"b.`unless_amount`," +
				"b.`exceed_amount`," +
				"b.`account_balance`," +
				"b.`health_balance`" +
				" FROM wlyy_prescription_pay b,wlyy_prescription p " +
				" WHERE b.prescription_code=p.`code` " +
				"AND b.trade_status='1' ";
		if(StringUtils.isNotBlank(beginDate) && !" 00:00:00".equals("beginDate")){
			sql = sql + "AND b.create_time>='"+beginDate+"' ";
		}
		
		if(StringUtils.isNotBlank(endDate) && !" 23:59:59".equals("beginDate")){
			sql = sql + "AND b.create_time<='"+endDate+"' ";
		}
		
		list =  jdbcTemplate.query(sql,new BeanPropertyRowMapper(PrescriptionPayVO.class));
		return list ;
	}
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/vo/SignPayVO.java

@@ -0,0 +1,199 @@
package com.yihu.wlyy.vo;
/**
 * 签约支付VO类
 * @author huangwenjie
 * @date 2017/12/13 08:45
 */
public class SignPayVO {
	
	private String  code;
	private String  charge_relation;
	private String  create_time;
	private String  name;
	private String  id_no;
	private String  patient;
	private String  openid;
	private String  ssc;
	private String  principal_ssc;
	private String  hospital_name;
	private String  total_amount;
	private String  selfpay_amount;
	private String  insurance_amount;
	private String  trade_status;
	private String  civil_pay;
	private String  self_pay;
	private String  account_pay;
	private String  heath_pay;
	private String  health_care_pay;
	private String  mi_total_fee;
	private String  cadres_pay;
	
	public String getCode() {
		return code;
	}
	
	public void setCode(String code) {
		this.code = code;
	}
	
	public String getCharge_relation() {
		return charge_relation;
	}
	
	public void setCharge_relation(String charge_relation) {
		this.charge_relation = charge_relation;
	}
	
	public String getCreate_time() {
		return create_time;
	}
	
	public void setCreate_time(String create_time) {
		this.create_time = create_time;
	}
	
	public String getName() {
		return name;
	}
	
	public void setName(String name) {
		this.name = name;
	}
	
	public String getId_no() {
		return id_no;
	}
	
	public void setId_no(String id_no) {
		this.id_no = id_no;
	}
	
	public String getPatient() {
		return patient;
	}
	
	public void setPatient(String patient) {
		this.patient = patient;
	}
	
	public String getOpenid() {
		return openid;
	}
	
	public void setOpenid(String openid) {
		this.openid = openid;
	}
	
	public String getSsc() {
		return ssc;
	}
	
	public void setSsc(String ssc) {
		this.ssc = ssc;
	}
	
	public String getPrincipal_ssc() {
		return principal_ssc;
	}
	
	public void setPrincipal_ssc(String principal_ssc) {
		this.principal_ssc = principal_ssc;
	}
	
	public String getHospital_name() {
		return hospital_name;
	}
	
	public void setHospital_name(String hospital_name) {
		this.hospital_name = hospital_name;
	}
	
	public String getTotal_amount() {
		return total_amount;
	}
	
	public void setTotal_amount(String total_amount) {
		this.total_amount = total_amount;
	}
	
	public String getSelfpay_amount() {
		return selfpay_amount;
	}
	
	public void setSelfpay_amount(String selfpay_amount) {
		this.selfpay_amount = selfpay_amount;
	}
	
	public String getInsurance_amount() {
		return insurance_amount;
	}
	
	public void setInsurance_amount(String insurance_amount) {
		this.insurance_amount = insurance_amount;
	}
	
	public String getTrade_status() {
		return trade_status;
	}
	
	public void setTrade_status(String trade_status) {
		this.trade_status = trade_status;
	}
	
	public String getCivil_pay() {
		return civil_pay;
	}
	
	public void setCivil_pay(String civil_pay) {
		this.civil_pay = civil_pay;
	}
	
	public String getSelf_pay() {
		return self_pay;
	}
	
	public void setSelf_pay(String self_pay) {
		this.self_pay = self_pay;
	}
	
	public String getAccount_pay() {
		return account_pay;
	}
	
	public void setAccount_pay(String account_pay) {
		this.account_pay = account_pay;
	}
	
	public String getHeath_pay() {
		return heath_pay;
	}
	
	public void setHeath_pay(String heath_pay) {
		this.heath_pay = heath_pay;
	}
	
	public String getHealth_care_pay() {
		return health_care_pay;
	}
	
	public void setHealth_care_pay(String health_care_pay) {
		this.health_care_pay = health_care_pay;
	}
	
	public String getMi_total_fee() {
		return mi_total_fee;
	}
	
	public void setMi_total_fee(String mi_total_fee) {
		this.mi_total_fee = mi_total_fee;
	}
	
	public String getCadres_pay() {
		return cadres_pay;
	}
	
	public void setCadres_pay(String cadres_pay) {
		this.cadres_pay = cadres_pay;
	}
}

patient-co-manage/wlyy-manage/src/main/resources/application.yml

@@ -140,17 +140,17 @@ spring:
  profiles: test
  datasource:
    wlyy:
      url: jdbc:mysql://172.19.103.85/wlyy?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
      url: jdbc:mysql://172.19.103.85:3306/wlyy?useUnicode:true&characterEncoding=utf-8&autoReconnect=true
      username: linzhou
      password: linzhou
    device:
      url: jdbc:mysql://172.19.103.77:3306/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: root
      password: 123456
      url: jdbc:mysql://172.19.103.85:3306/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: linzhou
      password: linzhou
    medicine:
      url: jdbc:mysql://172.19.103.77:3306/medicine?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: root
      password: 123456
      url: jdbc:mysql://172.19.103.85:3306/medicine?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: linzhou
      password: linzhou
  sms: # SMS短信配置
    yihu_sms_url: https://smsapi.ums86.com:9600/sms/Api/Send.do
    yihu_sms_code: 229336

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

@@ -132,12 +132,12 @@
							<sec:authorize url="/admin/static/wechat/initial">
								<li><a href="javascript:locationMenu('staticWechat');">微信统计报表</a></li>
							</sec:authorize>
							<%--<sec:authorize url="/admin/static/sign/initial">--%>
								<%--<li><a href="javascript:locationMenu('staticSign');">签约统计报表</a></li>--%>
							<%--</sec:authorize>--%>
							<sec:authorize url="/admin/static/device/initial">
								<li><a href="javascript:locationMenu('staticDevice');">设备统计报表</a></li>
							</sec:authorize>
							<sec:authorize url="/admin/static/pay/initial">
								<li><a href="javascript:locationMenu('staticPay');">支付统计报表</a></li>
							</sec:authorize>
							<sec:authorize url="/admin/static/static/center">
						</ul>
					</div>

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

@@ -26,11 +26,11 @@
            </div>
            <br>
            <div id="export_patient_device_list" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam  f-ml10" >
                <span>导出居民设备绑定明细</span>
                <span>设备绑定明细</span>
                <br>
            </div>
            <div id="export_patient_healthindex_list" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam  f-ml10" >
                <span>导出居民设备体征上传明细</span>
                <span>体征上传明细</span>
                <br>
            </div>
            <br>

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

@@ -0,0 +1,42 @@
<%@ page language="java" contentType="text/html; charset=UTF-8"
         pageEncoding="UTF-8"%>
<!DOCTYPE html>
<html lang="en">
<head>
    <%@ include file="../head/page_head.jsp"%>
    <title>支付统计报表</title>
</head>
<body>
<div >
    <div style="font-family:微软雅黑;font-size:Small;display:block;clear:left;padding:0;margin:0;margin-left: 5px">
        <div style="position:relative;display:inline;left:10px;top:8px;white-space:nowrap;text-align:center;background-color:#ffffff;font-weight:bold">支付报表导出</div>
        <div id ="pay_static_btn_div" data-role-form style="height:auto;width:auto;border:#dde7f1 1px solid;">
            <br>
            <div class="m-form-control f-ml15">
                <input type="text" id="inp_star_date" placeholder="开始日期" class="f-ml10" data-attr-scan="beginDate"/>
            </div>
            <br>
            <div class="m-form-control f-ml15">
                <input type="text" id="inp_end_date" placeholder="结束日期" class="f-ml10" data-attr-scan="endDate"/>
            </div>
            <br>
            <div id="export_sign_list" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam  f-ml10" >
                <span>签约支付导出</span>
                <br>
            </div>
            <div id="export_prescription_list" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam  f-ml10" >
                <span>长处方支付导出</span>
                <br>
            </div>
            <br>
        </div>
    </div>
</div>
</body>
<%@ include file="../head/page_foot.jsp"%>
<%@ include file="static_pay_js.jsp" %>
</html>

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

@@ -0,0 +1,148 @@
<%--
  Created by IntelliJ IDEA.
  User: Mewtwo
  Date: 2017/12/8
  Time: 11:29
  To change this template use File | Settings | File Templates.
--%>
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="utf-8" %>
<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
<script>
    (function ( $, win) {
        $(function () {
            /* ************************** 变量定义 ******************************** */
            // 通用工具类库
            var retrieve = null;
            var inpStarDate = null,inpEndDate = null;
            retrieve = {
                url: {
                    //接口链接
                    /*
                    * 省，市，区
                    * */
                    district: '/common/district',
                    /*
                    *获取医院列表
                    * */
                    hospitalsByType: '/admin/hos/hospitalsByType',
                },
                $element: $('#pay_static_btn_div'),
                $inpStarDate: $('#inp_star_date'),
                $inpEndDate: $('#inp_end_date'),
                dnc: null,
                ccc: null,
                hc: null,
                $btnExportSign: $('#export_sign_list'),
                $btnExportPrescription: $('#export_prescription_list'),
                init: function () {
                    inpStarDate = this.$inpStarDate.ligerDateEditor({
                        format: "yyyy-MM-dd",
                        showTime: false,
                        labelWidth: 100,
                        labelAlign: 'center',
                        cancelable: true
                    });
                    inpEndDate = this.$inpEndDate.ligerDateEditor({
                        format: "yyyy-MM-dd",
                        showTime: false,
                        labelWidth: 100,
                        labelAlign: 'center',
                        cancelable: true
                    });
                    this.bindEvents();
                },
                bindEvents: function () {
                    var me = this;
                    me.$element.attrScan();
                    //签约支付报表导出
                    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';
                        //定义一个form表单
                        var myform = $("<form></form>");
                        myform.attr('method','post')
                        myform.attr('action',ctx + '/admin/static/pay/signpayToExcel');
                        //开始时间
                        var beginDate = $("<input type='hidden' name='beginDate' />")
                        beginDate.attr('value',values.beginDate);
                        //结束时间
                        var endDate = $("<input type='hidden' name='endDate' />")
                        endDate.attr('value',values.endDate);
                        myform.append(beginDate);
                        myform.append(endDate);
                        myform.appendTo('body').submit(); //must add this line for higher html spec
                    });
                    //长处方支付报表导出
                    me.$btnExportPrescription.on('click',function () {
                        var values = me.$element.Fields.getValues();
                        values.beginDate = values.beginDate + ' 00:00:00';
                        values.endDate = values.endDate + ' 23:59:59';
                        //定义一个form表单
                        var myform = $("<form></form>");
                        myform.attr('method','post')
                        myform.attr('action',ctx + '/admin/static/pay/prescriptionToExcel');
                        //开始时间
                        var beginDate = $("<input type='hidden' name='beginDate' />")
                        beginDate.attr('value',values.beginDate);
                        //结束时间
                        var endDate = $("<input type='hidden' name='endDate' />")
                        endDate.attr('value',values.endDate);
                        myform.append(beginDate);
                        myform.append(endDate);
                        myform.appendTo('body').submit(); //must add this line for higher html spec
                    });
                },
                rAjax: function ( url, d, cb) {
                    $.ajax({
                        url: ctx + url,
                        data: d,
                        type: 'POST',
                        dataType: 'json',
                        success: function (data) {
                            if (data.status == 200) {
                                cb && cb.call( this, data);
                            } else {
                                $.Notice.error(data.msg);
                            }
                        }
                    });
                },
                formatDate:function (date) {//格式化日期
                    var myyear = date.getFullYear();
                    var mymonth = date.getMonth()+1;
                    var myweekday = date.getDate();
                    if(mymonth < 10){
                        mymonth = "0" + mymonth;
                    }
                    if(myweekday < 10){
                        myweekday = "0" + myweekday;
                    }
                    return (myyear+"-"+mymonth + "-" + myweekday);
                }
            };
            win.reloadMasterUpdateGrid = function () {
                retrieve.reloadGrid(retrieve);
            };
            retrieve.init();
        });
    })( jQuery, window);
</script>

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

@@ -4,7 +4,7 @@
<html lang="en">
<head>
    <%@ include file="../head/page_head.jsp"%>
    <title>机构管理</title>
    <title>微信统计报表</title>
</head>
<body>

patient-co-manage/wlyy-manage/src/main/webapp/static/js/menu.js

@@ -26,6 +26,7 @@ var menu = {
    "staticPrescription": "/admin/static/prescription/initial",//长处方数据统计
    "staticWechat": "/admin/static/wechat/initial",//微信统计报表
    "staticDevice": "/admin/static/device/initial",//设备统计报表
    "staticPay": "/admin/static/pay/initial",//支付统计报表
    //安全管理
    "user": "/admin/user/initial",//人员管理界面

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/jkEduArticle/ThirdJkEduArticleController.java

@@ -13,6 +13,7 @@ import com.yihu.wlyy.wechat.util.WeiXinTempMsgSendUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -148,9 +149,14 @@ public class ThirdJkEduArticleController extends BaseController {
                                        @ApiParam(name = "articleCategoryId", value = "文章类别ID")
                                        @RequestParam(value = "articleCategoryId", required = false,defaultValue = "1") String articleCategoryId,
                                        @ApiParam(name = "articleCategoryName", value = "文章类别名称")
                                        @RequestParam(value = "articleCategoryName", required = false) String articleCategoryName){
                                        @RequestParam(value = "articleCategoryName", required = false) String articleCategoryName,
                                        @ApiParam(name = "userType", value = "1医生 2居民")
                                        @RequestParam(value = "userType", required = false) String userType){
        try {
            thirdJkEduArticleService.saveArticleCollection(articleId,articleCategoryId,articleCategoryName,getUID(),1);
            if(StringUtils.isBlank(userType)){
                userType = "1";
            }
            thirdJkEduArticleService.saveArticleCollection(articleId,articleCategoryId,articleCategoryName,getUID(),Integer.parseInt(userType));
//            thirdJkEduArticleService.saveArticleCollection(articleId,articleCategoryId,articleCategoryName,"0de7295862dd11e69faffa163e8aee56",1);
            return success("收藏成功！");