Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/app/charge/OnePayService.java

@@ -341,7 +341,7 @@ public class OnePayService {
        chargePay.setCreateTime(formatDate.parse(outChargeTime));//接入应用内业务时间
        chargePay.setMedOrgNo(medOrgNo);//医疗机构编号
        chargePay.setMedOrgName(medOrgName);//医疗机构名称
        chargePay.setBillNo(billNo);//待结算费用单据号
        chargePay.setBillNo(billNo==null?billNo:billNo.trim());//待结算费用单据号
        chargePay.setSsc(cardNo);//医保卡号
        chargePay.setTotalAmount(Integer.parseInt(totalAmount));//交易总金额
        chargePay.setInsuranceAmount(Integer.parseInt(insuranceAmount));//医保支付金额
@@ -406,10 +406,10 @@ public class OnePayService {
            civilPay = response.getString("civilPay");
        }
        chargePay.setMiRegisterNo(miRegisterNo);//医保挂号
        chargePay.setMiCollectDate(miCollectDate);
        chargePay.setMiCollectTime(miCollectTime);
        chargePay.setMiSettleNo(miSettleNo);
        chargePay.setMiRegisterNo(miRegisterNo==null?miRegisterNo:miRegisterNo.trim());//医保挂号
        chargePay.setMiCollectDate(miCollectDate==null?miCollectDate:miCollectDate.trim());
        chargePay.setMiCollectTime(miCollectTime==null?miCollectTime:miCollectTime.trim());
        chargePay.setMiSettleNo(miSettleNo==null?miSettleNo:miSettleNo.trim());
        chargePay.setMiCollectStatus(miCollectStatus);
        chargePay.setMiRegisterStatus(miRegisterStatus);
        chargePay.setCadresPay(cadresPay);

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

@@ -86,7 +86,7 @@ images:
sign:
  check_upload: http://172.19.103.85:8011/wlyy_service
  check_upload: http://172.19.103.88:8011/wlyy_service
quartz:

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -394,7 +394,7 @@ public class SignPatientLabelInfoService extends BaseService {
                        "    t1.* " +
                        " FROM " +
                        "    wlyy_sign_family t1, " +
                        "    wlyy_sign_patient_label_info t2 " +
                        "    wlyy_sign_patient_label_info t2, " +
                        "    wlyy_patient p "+
                        " WHERE " +
                        "    t2.label = ? " +

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignWebService.java

@@ -1169,6 +1169,18 @@ public class SignWebService extends BaseService {
            }
            if ("followup_class".equals(key)) {
                String followupClassName = systemDictService.getDictValue("FOLLOWUP_CLASS_DICT", map.get(key) + "");
                String followupClass = map.get(key).toString();
                if (StringUtils.isNoneBlank(followupClass) && followupClass.contains(",")) {
                    String[] followupClassArray = followupClass.split(",");
                    followupClassName = "";
                    for (int i = 0; i < followupClassArray.length; i++) {
                        followupClassName += systemDictService.getDictValue("FOLLOWUP_CLASS_DICT", followupClassArray[i]);
                        if (i != followupClassArray.length - 1) {
                            followupClassName += ",";
                        }
                    }
                }
                
                resultObject.put("followup_class_name", followupClassName);
            }
            if ("followup_manager_status".equals(key)) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/weixin/wxpay/service/OnePayService.java

@@ -846,7 +846,7 @@ public class OnePayService {
        chargePay.setCreateTime(formatDate.parse(outChargeTime));//接入应用内业务时间
        chargePay.setMedOrgNo(medOrgNo);//医疗机构编号
        chargePay.setMedOrgName(medOrgName);//医疗机构名称
        chargePay.setBillNo(billNo);//待结算费用单据号
        chargePay.setBillNo(billNo==null?billNo:billNo.trim());//待结算费用单据号
        chargePay.setSsc(cardNo);//医保卡号
        chargePay.setTotalAmount(Integer.parseInt(totalAmount));//交易总金额
        chargePay.setInsuranceAmount(Integer.parseInt(insuranceAmount));//医保支付金额
@@ -911,10 +911,10 @@ public class OnePayService {
            civilPay = response.getString("civilPay");
        }
        chargePay.setMiRegisterNo(miRegisterNo);//医保挂号
        chargePay.setMiCollectDate(miCollectDate);
        chargePay.setMiCollectTime(miCollectTime);
        chargePay.setMiSettleNo(miSettleNo);
        chargePay.setMiRegisterNo(miRegisterNo==null?miRegisterNo:miRegisterNo.trim());//医保挂号
        chargePay.setMiCollectDate(miCollectDate==null?miCollectDate:miCollectDate.trim());
        chargePay.setMiCollectTime(miCollectTime==null?miCollectTime:miCollectTime.trim());
        chargePay.setMiSettleNo(miSettleNo==null?miSettleNo:miSettleNo.trim());
        chargePay.setMiCollectStatus(miCollectStatus);
        chargePay.setMiRegisterStatus(miRegisterStatus);
        chargePay.setCadresPay(cadresPay);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/patient/DoctorPatientGroupController.java

@@ -141,6 +141,8 @@ public class DoctorPatientGroupController extends BaseController {
                        Date qyrq = (Date) object[10];
                        //患者身份证
                        Object idcard = object[12];
                        //微信openid
                        Object openid = object[13];
                        if (StringUtils.equals(group, grouplist.getCode())) {
                            if (patientsMap.containsKey(object[1].toString())) {
                                if ((patientsMap.get(object[1].toString()).get("signType").toString().equals("1") || patientsMap.get(object[1].toString()).get("signType").toString().equals("2")) &&
@@ -174,6 +176,7 @@ public class DoctorPatientGroupController extends BaseController {
                            // 设置签约类型
                            patientJson.put("signType", signType);
                            patientJson.put("idcard", idcard);
                            patientJson.put("openid",openid);
                            String diseases = redisTemplate.opsForValue().get("disease:" + code.toString());
                            if (!StringUtils.isEmpty(diseases)) {