Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/healthCare/service/HealthCareService.java

@@ -214,7 +214,7 @@ public class HealthCareService {
            data.put("medical_mode","10");//医疗就诊方式	10	门(急)诊
            data.put("name",doctorDO.getName());//医师姓名
            data.put("idcard",doctorDO.getIdcard());//医师证件号
            data.put("cert_type","01");//医师证件类型
            data.put("cert_type",doctorDO.getIdCardType());//医师证件类型
            String result = requestYlz(data,"N20.17.02.01","医师身份验证");
            if(result == null){
@@ -251,7 +251,7 @@ public class HealthCareService {
        JSONObject data = new JSONObject();
        data.put("name",doctorDO.getName());//医师姓名
        data.put("idcard",doctorDO.getIdcard());//医师证件号
        data.put("cert_type","01");//医师证件类型
        data.put("cert_type",doctorDO.getIdCardType());//医师证件类型
        data.put("redirect_url",hospitalSysDictDO.getDictValue());//回调地址
        String result = requestYlz(data,"N20.17.02.02","医师人脸签到表单地址");
        if(result == null){
@@ -277,7 +277,7 @@ public class HealthCareService {
        JSONObject data = new JSONObject();
        data.put("name",doctorDO.getName());//医师姓名
        data.put("idcard",doctorDO.getIdcard());//医师证件号
        data.put("cert_type","01");//医师证件类型
        data.put("cert_type",doctorDO.getIdCardType());//医师证件类型
        String result = requestYlz(data,"N20.17.02.05","获取医师人脸签到数据");
        if(result == null){
            throw new Exception("医保请求失败");
@@ -308,7 +308,7 @@ public class HealthCareService {
        JSONObject data = new JSONObject();
        data.put("name",doctorDO.getName());//医师姓名
        data.put("idcard",doctorDO.getIdcard());//医师证件号
        data.put("cert_type","01");//医师证件类型
        data.put("cert_type",doctorDO.getIdCardType());//医师证件类型
        data.put("redirect_url",hospitalSysDictDO.getDictValue());//回调地址
        String result = requestYlz(data,"N20.17.02.06","2.3.3\t获取医师人脸签到数据");
        if(result == null){

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -5491,7 +5491,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }else if ("prescriptionPayRemind".equalsIgnoreCase(titelType)) {
            //开具处方后向患者发送支付提醒
            first = outpatientDO.getConsumerName() + "，您好！ 医生已为您开具处方，请及时支付。";
            contentMsg = "医生已为您开具处方，请及时支付（有效期七天）。";
            contentMsg = "医生已为您开具处方，请及时支付（有效期六天）。";
            remark = "点击完成支付，如您已支付请忽略本条信息";
            msgUrl="/ims-wx/index.html#/returnVisit/prescriptionDetail?outpatientId="+outpatientId+"&id="+remindMsg;
            logger.info("处方支付微信消息模板推送开始");
@@ -11277,8 +11277,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        params.put("type", "Outpatient");
        params.put("xmlStr", patNo);
        returnValue = com.yihu.jw.utils.WebserviceUtil.post(url,
                "http://business.htemr.haitaiinc.com",
                "manageEmrDataRestore",
                "http://pdf.haitaiinc.com",
                "manageEmrDataAll",
                params);
        logger.info("门诊病历列表信息，返回值xmlstr:" + returnValue);
@@ -15223,11 +15223,21 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                            return object;
                        }
                    }else {
                        if (outpatientDO.getIsDisease().equalsIgnoreCase("1")){
                            object.put("code","403");
                            object.put("message","特殊病种已经结算过，请联系医院处理！");
                            return object;
                        }
                        ylzMedicalRelationDO.setStatus(0);
                        ylzMedicailRelationDao.save(ylzMedicalRelationDO);
                    }
                }else {
                    if (jsonObject.getString("flag").equalsIgnoreCase("50204")){
                        if (outpatientDO.getIsDisease().equalsIgnoreCase("1")){
                            object.put("code","403");
                            object.put("message","特殊病种已经结算过，请联系医院处理！");
                            return object;
                        }
                        ylzMedicalRelationDO.setStatus(0);
                        ylzMedicailRelationDao.save(ylzMedicalRelationDO);
                    }else {

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/YkyyPrescriptionService.java

@@ -1630,7 +1630,7 @@ public class YkyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
            invoice.put("withTaxFlag", 0);//单价含税标志：0:不含税,1:含税
            invoice.put("taxRate", taxrate);//税率
            invoice.put("invoiceLineProperty", 0);//发票行性质：0,正常行;1,折扣行;2,被折扣行，红票只有正常行
            invoice.put("price", mxDO.getTotalMoney());//单价（精确到小数点后8位），当单价(price)为空时，数量(num)也必须为空；(price)为空时，含税金额(taxIncludedAmount)、不含税金额(taxExcludedAmount)、税额(tax)都不能为空
            invoice.put("price", mxDO.getPrice());//单价（精确到小数点后8位），当单价(price)为空时，数量(num)也必须为空；(price)为空时，含税金额(taxIncludedAmount)、不含税金额(taxExcludedAmount)、税额(tax)都不能为空
            invoice.put("unit", mxDO.getChargeUnit());//单位
            invoice.put("specType", mxDO.getSpecificationType());//规格型号
            invoice.put("tax", 0);//

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/YkyyEntranceService.java

@@ -2485,6 +2485,7 @@ public class YkyyEntranceService {
        hlwYsMzJzLsDO.setJSSJ(DateUtil.getNight23());
        hlwYsMzJzLsDO.setJZZT(9);
        hlwYsMzJzLsDO.setJZLX(3);//就诊类型
        hlwYsMzJzLsDO.setWLYY(3);
        hlwYsMzJzLsDO.setZDMC("健康查体");
        hlwYsMzJzLsDO.setMQZD("健康查体");
        /*if (StringUtils.isNoneBlank(wlyyPrescriptionVO.getAdmNo())){
@@ -2710,6 +2711,7 @@ public class YkyyEntranceService {
        hlwGhmxDO.setSFFS(0);
        hlwGhmxDO.setJZZT(2);
        hlwGhmxDO.setJZXH(0);
        hlwGhmxDO.setWLYY(3);
        hlwGhmxDO.setBRID(Integer.parseInt(patientMappingDO.getMappingCode()));
        hlwGhmxDO.setGHSJ(new Date());//挂号时间
        hlwGhmxDO.setGHLB(1);//挂号类别
@@ -2807,6 +2809,7 @@ public class YkyyEntranceService {
                hlwYsMzJzLsDO.setJSSJ(DateUtil.getNight23());
                hlwYsMzJzLsDO.setJZZT(9);
                hlwYsMzJzLsDO.setJZLX(3);//就诊类型
                hlwYsMzJzLsDO.setWLYY(3);
                hlwYsMzJzLsDO.setZDMC(diagnosisDO.getName());
                hlwYsMzJzLsDO.setMQZD(diagnosisDO.getName());
                if (StringUtils.isNoneBlank(wlyyPrescriptionVO.getAdmNo())){
@@ -2876,6 +2879,7 @@ public class YkyyEntranceService {
                    hlwYsMzJbzdDO.setJBMC(prescriptionDiagnosisDO.getName());//诊断名称
                    hlwYsMzJbzdDO.setZDLX(1);//诊断类型
                    hlwYsMzJbzdDO.setTJBZ(1);//提交标志
                    hlwYsMzJzLsDO.setWLYY(3);
                    hlwYsMzJbzdDO.setZNXH(i+1);
                    if (StringUtils.isNoneBlank(wlyyPrescriptionVO.getAdmNo())){
                        hlwYsMzJbzdDO.setJZXH(Integer.parseInt(wlyyPrescriptionVO.getAdmNo()));

server/svr-authentication/src/main/java/com/yihu/jw/security/core/userdetails/jdbc/WlyyUserDetailsService.java

@@ -1036,13 +1036,15 @@ public class WlyyUserDetailsService extends JdbcDaoSupport implements UserDetail
            JSONObject object1 = JSONObject.parseObject(res);
            if (null != object1&&null!=object1.get("status") && "200".equals(object1.get("status").toString())) {
                JSONObject patient = object1.getJSONObject("userinfo");
                logger.info("开始同步患者数据");
                logger.info("开始同步患者数据"+res);
                String idcard = patient.getString("idcard");
                String idtype = patient.getString("idtype");
                BasePatientDO patientDO2 = patientDao.findByIdcardAndDel(idcard,"1");
                BasePatientDO patient1 = new BasePatientDO();
                String salt = UUID.randomUUID().toString().substring(0,5);
                String mobile = patient.getString("mobile");
                String birthday = patient.getString("birthday");
                Integer sex = patient.getInteger("sex");
                String pw = null;
                if(org.apache.commons.lang3.StringUtils.isNotBlank(mobile)){
                    pw = mobile.substring(mobile.length()-6);
@@ -1058,14 +1060,25 @@ public class WlyyUserDetailsService extends JdbcDaoSupport implements UserDetail
                patient1.setIdcard(idcard);
                patient1.setCardType(idtype);
                patient1.setName(patient.getString("name"));
                patient1.setSex(StringUtils.isNotBlank(idcard)?Integer.parseInt(IdCardUtil.getSexForIdcard_new(idcard)):null);
                if (sex!=null){
                    patient1.setSex(sex);
                }else {
                    patient1.setSex(StringUtils.isNotBlank(idcard)?Integer.parseInt(IdCardUtil.getSexForIdcard_new(idcard)):null);
                }
                patient1.setMobile(mobile);
                patient1.setDel("1");
                patient1.setEnabled(1);
                patient1.setLocked(0);
                patient1.setCreateTime(new Date());
                patient1.setUpdateTime(new Date());
                patient1.setBirthday(IdCardUtil.getBirthdayForIdcard(idcard));
                if (StringUtils.isNotBlank(birthday)){
                    patient1.setBirthday(DateUtil.strToDateShort(birthday));
                    patient1.setAge(com.yihu.jw.security.utils.DateUtil.getAgeByBirthday(patient1.getBirthday()));
                }else {
                    patient1.setBirthday(IdCardUtil.getBirthdayForIdcard(idcard));
                    patient1.setAge(IdCardUtil.getAgeForIdcard(idcard));
                }
                patient1 = patientDao.save(patient1);
                logger.info("结束同步患者数据");
                return patient;