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

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/user/UserService.java

@@ -197,6 +197,7 @@ public class UserService extends BaseJpaService<User,UserDao> {
            List<ManageDictEntry> manageDictEntries = manageDictEntryDao.findByDictIdAndCodes(dictId, codes);
            if (null != manageDictEntries && manageDictEntries.size() > 0) {
                return manageDictEntries.get(0).getValue();
//                return "http://localhost:8180/admin/main";
            }
        }
        return null;

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

@@ -36,11 +36,6 @@
                <div class="m-form-control f-ml15">
                    <input type="text" id="inp_end_date" placeholder="结束日期" class="f-ml10" data-attr-scan="endDate"/>
                </div>
            </div>
        </div>
        <div class="m-form-group f-mt10">
            <div class="m-form-group f-mt10">
                <div class="m-form-control f-ml15">
                    <input type="text" id="inp_disease" placeholder="请选择病种" class="f-ml10" data-attr-scan="disease"/>
                </div>
@@ -58,6 +53,12 @@
                </div>
            </div>
        </div>
        <div class="m-form-group f-mt10">
            <div class="m-form-group f-mt10">
            </div>
        </div>
    </div>
    <!-- 列表 -->
    <div id="div_prescription_list">

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

@@ -138,10 +138,6 @@
                        valueField: 'statusId',
                    });
                    //查询
                    me.$btnSearch.on('click',function () {
                        me.reloadGrid(me);
                    });
                },
                //初始化市区下拉框

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/entity/HospitalMapping.java

@@ -13,15 +13,21 @@ import javax.persistence.Table;
@Entity
@Table(name = "wlyy_hospital_mapping")
public class HospitalMapping extends IdEntity {
	
	// 本地机构代码
	private String code;
	// 机构名称
	private String name;	
	private String name;
	// 对接机构
	private String type;
	// 映射机构代码
	private String mappingCode;
	// 易联众appid
	private String appId;
	// 易联众app secret
	private String appSecret;
	//机构编码号（来自基卫）
	private String sbCode;
	// 基卫授权码
	private String licence;
@@ -64,4 +70,28 @@ public class HospitalMapping extends IdEntity {
	public void setLicence(String licence) {
		this.licence = licence;
	}
	
	public String getAppId() {
		return appId;
	}
	
	public void setAppId(String appId) {
		this.appId = appId;
	}
	
	public String getAppSecret() {
		return appSecret;
	}
	
	public void setAppSecret(String appSecret) {
		this.appSecret = appSecret;
	}
	
	public String getSbCode() {
		return sbCode;
	}
	
	public void setSbCode(String sbCode) {
		this.sbCode = sbCode;
	}
}

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/entity/WlyyCharge.java

@@ -14,7 +14,7 @@ import java.util.Date;
@Entity
@Table(name = "wlyy_charge")
public class WlyyCharge extends IdEntity {
	
	private String code;   //  接入应用支付业务流水号
	private String chargeType;   //交易类型  1签约 2续签
	private String chargeRelation;   //交易关联代码
@@ -22,6 +22,7 @@ public class WlyyCharge extends IdEntity {
	private String patient;   //  用户
	private String openid;   //  用戶微信openid
	private String ssc;   // 医保卡号
	private String principalSsc;   // 实际签约卡号
	private String name;   //  姓名
	private String idType;   //  证件类型
	private String idNo;   //  证件号码
@@ -43,231 +44,356 @@ public class WlyyCharge extends IdEntity {
	private String medOrgNo;   //  医疗机构编码
	private String medOrgName;   //  医疗机构名称
	private String billNo;   //  待结算费用单据号
	private Date updateTime;//修改时间
	
	private String miCollectDate;//收费日期
	private String miCollectTime;//收费时间
	private String miSettleNo;//医保收费单据号 (医保签约号)
	private String miCollectStatus;//扣费状态
	private String miRegisterStatus;//登记状态
	private String cadresPay;//政府补贴支付
	private String miTotalFee;//本次报销总额
	private String healthCarePay;//保健基金支付
	private String heathPay;//健康账户支付
	private String accountPay;//医保账户支付
	private String selfPay;//个人现金支付
	private String civilPay;//民政补助金额
	
	public String getPrincipalSsc() {
		return principalSsc;
	}
	
	public void setPrincipalSsc(String principalSsc) {
		this.principalSsc = principalSsc;
	}
	
	public String getMiCollectDate() {
		return miCollectDate;
	}
	
	public void setMiCollectDate(String miCollectDate) {
		this.miCollectDate = miCollectDate;
	}
	
	public String getMiCollectTime() {
		return miCollectTime;
	}
	
	public void setMiCollectTime(String miCollectTime) {
		this.miCollectTime = miCollectTime;
	}
	
	public String getMiSettleNo() {
		return miSettleNo;
	}
	
	public void setMiSettleNo(String miSettleNo) {
		this.miSettleNo = miSettleNo;
	}
	
	public String getMiCollectStatus() {
		return miCollectStatus;
	}
	
	public void setMiCollectStatus(String miCollectStatus) {
		this.miCollectStatus = miCollectStatus;
	}
	
	public String getMiRegisterStatus() {
		return miRegisterStatus;
	}
	
	public void setMiRegisterStatus(String miRegisterStatus) {
		this.miRegisterStatus = miRegisterStatus;
	}
	
	public String getCadresPay() {
		return cadresPay;
	}
	
	public void setCadresPay(String cadresPay) {
		this.cadresPay = cadresPay;
	}
	
	public String getMiTotalFee() {
		return miTotalFee;
	}
	
	public void setMiTotalFee(String miTotalFee) {
		this.miTotalFee = miTotalFee;
	}
	
	public String getHealthCarePay() {
		return healthCarePay;
	}
	
	public void setHealthCarePay(String healthCarePay) {
		this.healthCarePay = healthCarePay;
	}
	
	public String getHeathPay() {
		return heathPay;
	}
	
	public void setHeathPay(String heathPay) {
		this.heathPay = heathPay;
	}
	
	public String getAccountPay() {
		return accountPay;
	}
	
	public void setAccountPay(String accountPay) {
		this.accountPay = accountPay;
	}
	
	public String getSelfPay() {
		return selfPay;
	}
	
	public void setSelfPay(String selfPay) {
		this.selfPay = selfPay;
	}
	
	public String getCivilPay() {
		return civilPay;
	}
	
	public void setCivilPay(String civilPay) {
		this.civilPay = civilPay;
	}
	
	public String getChargeType() {
		return chargeType;
	}
	
	public void setChargeType(String chargeType) {
		this.chargeType = chargeType;
	}
	
	public String getChargeRelation() {
		return chargeRelation;
	}
	
	public void setChargeRelation(String chargeRelation) {
		this.chargeRelation = chargeRelation;
	}
	
	public String getCode() {
		return code;
	}
	
	public void setCode(String code) {
		this.code = code;
	}
	
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	public Date getCreateTime() {
		return createTime;
	}
	
	public void setCreateTime(Date createTime) {
		this.createTime = createTime;
	}
	
	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 getName() {
		return name;
	}
	
	public void setName(String name) {
		this.name = name;
	}
	
	public String getIdType() {
		return idType;
	}
	
	public void setIdType(String idType) {
		this.idType = idType;
	}
	
	public String getIdNo() {
		return idNo;
	}
	
	public void setIdNo(String idNo) {
		this.idNo = idNo;
	}
	
	public String getHospital() {
		return hospital;
	}
	
	public void setHospital(String hospital) {
		this.hospital = hospital;
	}
	
	public String getHospitalName() {
		return hospitalName;
	}
	
	public void setHospitalName(String hospitalName) {
		this.hospitalName = hospitalName;
	}
	
	public Integer getTotalAmount() {
		return totalAmount;
	}
	
	public void setTotalAmount(Integer totalAmount) {
		this.totalAmount = totalAmount;
	}
	
	public Integer getSelfpayAmount() {
		return selfpayAmount;
	}
	
	public void setSelfpayAmount(Integer selfpayAmount) {
		this.selfpayAmount = selfpayAmount;
	}
	
	public Integer getInsuranceAmount() {
		return insuranceAmount;
	}
	
	public void setInsuranceAmount(Integer insuranceAmount) {
		this.insuranceAmount = insuranceAmount;
	}
	
	public String getNeedUpload() {
		return needUpload;
	}
	
	public void setNeedUpload(String needUpload) {
		this.needUpload = needUpload;
	}
	
	public String getUploadLog() {
		return uploadLog;
	}
	
	public void setUploadLog(String uploadLog) {
		this.uploadLog = uploadLog;
	}
	
	public String getMiRegisterNo() {
		return miRegisterNo;
	}
	
	public void setMiRegisterNo(String miRegisterNo) {
		this.miRegisterNo = miRegisterNo;
	}
	
	public String getFeeDetail() {
		return feeDetail;
	}
	
	public void setFeeDetail(String feeDetail) {
		this.feeDetail = feeDetail;
	}
	
	public String getChannel() {
		return channel;
	}
	
	public void setChannel(String channel) {
		this.channel = channel;
	}
	
	public String getMerchName() {
		return merchName;
	}
	
	public void setMerchName(String merchName) {
		this.merchName = merchName;
	}
	
	public String getSubject() {
		return subject;
	}
	
	public void setSubject(String subject) {
		this.subject = subject;
	}
	
	public String getTradeStatus() {
		return tradeStatus;
	}
	
	public void setTradeStatus(String tradeStatus) {
		this.tradeStatus = tradeStatus;
	}
	
	public String getChargeNo() {
		return chargeNo;
	}
	
	public void setChargeNo(String chargeNo) {
		this.chargeNo = chargeNo;
	}
	
	public String getChargeTime() {
		return chargeTime;
	}
	
	public void setChargeTime(String chargeTime) {
		this.chargeTime = chargeTime;
	}
	
	public String getMedOrgNo() {
		return medOrgNo;
	}
	
	public void setMedOrgNo(String medOrgNo) {
		this.medOrgNo = medOrgNo;
	}
	
	public String getMedOrgName() {
		return medOrgName;
	}
	
	public void setMedOrgName(String medOrgName) {
		this.medOrgName = medOrgName;
	}
	
	public String getBillNo() {
		return billNo;
	}
	
	public void setBillNo(String billNo) {
		this.billNo = billNo;
	}
	
	public Date getUpdateTime() {
		return updateTime;
	}
	
	public void setUpdateTime(Date updateTime) {
		this.updateTime = updateTime;
	}
}

patient-co-service/wlyy_sign/src/main/java/com/yihu/wlyy/sign/service/ChargeZYService.java

@@ -6,6 +6,7 @@ import com.yihu.wlyy.sign.common.util.DateUtil;
import com.yihu.wlyy.sign.common.util.StringUtil;
import com.yihu.wlyy.sign.dao.*;
import com.yihu.wlyy.sign.entity.*;
import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -112,7 +113,7 @@ public class ChargeZYService {
            String idcard = sign.getIdcard();
            String year = sign.getSignYear();
            String operator = sign.getSignDoctorCode();
            String operator = sign.getDoctor();
            String signCode = sign.getCode();
            String[] hm = null;
@@ -187,6 +188,30 @@ public class ChargeZYService {
                    System.out.print("operator:"+operator+","+hm[0]);
                }
                params.put("CHARGE_OPERATOR", operator);  //收费医生
    
                //缴费明细---2017.12.12---黄文杰
                Map<String, String> INSUR_FEE_INFO = new HashMap<>();
                HospitalMapping hospitalMapping = hospitalMappingDao.getMappingCode(sign.getHospital(), "1");  //转换成基卫机构代码
                INSUR_FEE_INFO.put("qyjg00",hospitalMapping.getSbCode());//签约机构
                INSUR_FEE_INFO.put("qyys00",sign.getDoctorName());//签约医生
                INSUR_FEE_INFO.put("btlx00",sign.getExpensesType());//补贴类型
                INSUR_FEE_INFO.put("djjg00",hospitalMapping.getSbCode());//登记机构
                INSUR_FEE_INFO.put("djr000",sign.getDoctorName());//登记人
                INSUR_FEE_INFO.put("djsj00",DateUtil.dateToStrShort(sign.getBegin()));//登记时间
                INSUR_FEE_INFO.put("qyzt00",charge.getMiRegisterStatus());//登记状态
                INSUR_FEE_INFO.put("kfjg00",hospitalMapping.getSbCode());//扣费机构
                INSUR_FEE_INFO.put("kfrxm0",sign.getDoctorName());//扣费人
                INSUR_FEE_INFO.put("kfsj00",charge.getChargeTime());//扣费时间
                INSUR_FEE_INFO.put("kfzt00",charge.getMiCollectStatus());//扣费状态
                INSUR_FEE_INFO.put("kfdjh0",charge.getMiSettleNo());//扣费单据号
                INSUR_FEE_INFO.put("zje000",String.valueOf(charge.getMiTotalFee()));//扣费总额
                INSUR_FEE_INFO.put("zfbtzf",charge.getCadresPay());//政府补贴支付
                INSUR_FEE_INFO.put("tcjjzf",charge.getHealthCarePay());//医保统筹支付
                INSUR_FEE_INFO.put("jkzhzf",charge.getHeathPay());//健康账户支付
                INSUR_FEE_INFO.put("zhzfe0",charge.getAccountPay());//医保账户支付
                INSUR_FEE_INFO.put("xjzfe0",charge.getSelfPay());//个人现金自付
                INSUR_FEE_INFO.put("INSUR_FEE_INFO",JSONObject.fromObject(INSUR_FEE_INFO).toString());
                
                String response = zysoftService.uploadChargeInfo(params, hm[0], hm[1], operator);
                Map<String, String> map = zysoftService.getJwOne(response);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/health/HealthEduArticlePatientService.java

@@ -96,7 +96,7 @@ public class HealthEduArticlePatientService extends BaseService {
     * @param pagesize 分页大小
     * @return
     */
    public List<HealthEduArticlePatient> findByPatient(String patient,int wheaType, long id, int pagesize) {
    public List<HealthEduArticlePatient> findByPatient(String patient,int wheaType, int pageIndex, int pagesize) {
        if (pagesize <= 0) {
            pagesize = 10;
        }
@@ -120,17 +120,11 @@ public class HealthEduArticlePatientService extends BaseService {
                "      a.article = b.code" +
                " and ( a.send_type =1 or a.send_type is null or a.send_type = '') "+  //添加类型判断是集美的推送还是三师原来的推送
                " and a.patient = ?" +
                (id > 0 ? " and a.id < ? " : "") +
                (wheaType > 0 ? " and a.wheaType = ? " : "") +
                " order by a.id desc limit 0," + pagesize;
                " order by a.id desc limit "+pageIndex+"," + pagesize;
        Object params[] = null;
        if(wheaType>-1&&id>0){
            params = new Object[]{patient,id,wheaType};
        }else if(wheaType>-1&&id<0){
        if(wheaType>-1){
            params = new Object[]{patient,wheaType};
        }
        else if(wheaType<0&&id>0){
            params = new Object[]{patient,id};
        }else{
            params = new Object[]{patient};
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/health/HealthEduArticleController.java

@@ -64,11 +64,11 @@ public class HealthEduArticleController extends BaseController {
    @RequestMapping(value = "list")
    @ResponseBody
    @ApiOperation("查询文章列表")
    public String list(@RequestParam("id") long id, @RequestParam("pagesize") int pagesize, @RequestParam(required = true, value = "wheaType") int wheaType) {
    public String list(@RequestParam("page") int pageIndex, @RequestParam("pagesize") int pagesize, @RequestParam(required = true, value = "wheaType") int wheaType) {
        try {
//            List<HealthEduArticlePatient> list = healthEduArticlePatientService.findByPatient(getUID(), wheaType, id, pagesize);
//            增加判断是当前居民还是被代理人的文章列表
            List<HealthEduArticlePatient> list = healthEduArticlePatientService.findByPatient(getRepUID(), wheaType, id, pagesize);
            List<HealthEduArticlePatient> list = healthEduArticlePatientService.findByPatient(getRepUID(), wheaType, pageIndex, pagesize);
            JSONArray jsonArray = new JSONArray();
            Map<String, Doctor> docMap = new HashMap<>();
            if (list != null) {