添加工具类判断节假日

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

@@ -1654,7 +1654,7 @@ public class HcyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
                            ylzMedicalRelationDO.setHisSettleNo(object.getString("IPT_OTP_NO"));
                            ylzMedicalRelationDO.setCardNo(object.getString("CARD_NO"));
                            ylzMedicalRelationDO.setDate(DateUtil.strToDate(object.getString("BEGNTIME")));
                            ylzMedicalRelationDO.setBcwkje(object.getString("MEDFEE_SUMAMT"));
                            ylzMedicalRelationDO.setBcwkje(object.getString("YKFJE0"));
                        }else {
                            ylzMedicalRelationDO.setLogNo(logNo);
                            ylzMedicalRelationDO.setRelationCode(outpatientId);
@@ -1672,7 +1672,7 @@ public class HcyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
                            ylzMedicalRelationDO.setHisSettleNo(object.getString("IPT_OTP_NO"));
                            ylzMedicalRelationDO.setCardNo(object.getString("CARD_NO"));
                            ylzMedicalRelationDO.setDate(DateUtil.strToDate(object.getString("BEGNTIME")));
                            ylzMedicalRelationDO.setBcwkje(object.getString("MEDFEE_SUMAMT"));
                            ylzMedicalRelationDO.setBcwkje(object.getString("YKFJE0"));
                        }
                        ylzMedicalRelationDO = ylzMedicailRelationDao.save(ylzMedicalRelationDO);
                        ylzMedicailMxDao.deleteByMedicalId(ylzMedicalRelationDO.getId());

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

@@ -1086,6 +1086,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        WlyyOutpatientDO outpatientDO = objectMapper.readValue(outpatientJson, WlyyOutpatientDO.class);
        BasePatientDO patientDO = basePatientDao.findById(outpatientDO.getPatient());
        BaseDoctorDO doctorDO = baseDoctorDao.findById(outpatientDO.getDoctor());
        if (!StringUtils.isNoneBlank(outpatientDO.getMedicalState())){
            outpatientDO.setMedicalState("0");
        }
        outpatientDO.setIsAgree("1");
        outpatientDO.setMjz("mz");
        outpatientDO.setStatus("0");
@@ -14486,12 +14489,16 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                }
            }
            if (ylzMedicalRelationDO!=null&&ylzMedicalRelationDO.getStatus()==1){
                net.sf.json.JSONObject object2 = entranceService.qutpatientBalance(outpatientDO.getCardNo(), false);
                Double cardFee = object2.getDouble("ZHYE");
                //医保已结算直接返回数据
                List<YlzMedicalMxDO> mxDOList = ylzMedicailMxDao.findByMedicalId(ylzMedicalRelationDO.getId());
                ylzMedicalRelationDO.setYlzMedicalMxDOList(mxDOList);
                BigDecimal b1 = new BigDecimal(ylzMedicalRelationDO.getPersonCash());//个人现金
                BigDecimal b2 = new BigDecimal(ylzMedicalRelationDO.getPersonAccount());//个人账户
                BigDecimal b3 = new BigDecimal(ylzMedicalRelationDO.getMedicalPrice());//医保总金额
                ylzMedicalRelationDO.setBalance(cardFee+"");
                ylzMedicalRelationDO = ylzMedicailRelationDao.save(ylzMedicalRelationDO);
                Double totalPirce=b1.add(b2).add(b3).doubleValue();
                logger.info("总费用:"+totalPirce);
                if (totalPirce!=Double.parseDouble(ylzMedicalRelationDO.getTotalAmount())){
@@ -15559,4 +15566,25 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    }*/
    /**
     * 更新门诊记录
     * @param outpatientId
     * @param diseaseCode
     * @param diseaseName
     * @param medicalState
     * @return
     */
    public WlyyOutpatientDO updateOutpatient(String outpatientId,String diseaseCode,String diseaseName,String medicalState){
            WlyyOutpatientDO outpatientDO = outpatientDao.findById(outpatientId);
            if (StringUtils.isNoneBlank(diseaseCode)){
                outpatientDO.setDiseaseCode(diseaseCode);
                outpatientDO.setDiseaseName(diseaseName);
            }
            if (StringUtils.isNoneBlank(medicalState)){
                outpatientDO.setMedicalState(medicalState);
            }
            return outpatientDao.save(outpatientDO);
    }
}

server/svr-authentication/src/main/java/com/yihu/jw/security/oauth2/provider/endpoint/WlyyLoginEndpoint.java

@@ -2583,7 +2583,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
            isNeedGeet=wlyyHospitalSysDictDO.getDictValue();
        }
        String wechatId = parameters.get("wechatId");
        if (!wechatId.equalsIgnoreCase("xm_ihealth_wx")){
        if (!StringUtils.isEmpty(wechatId)&&!wechatId.equalsIgnoreCase("xm_ihealth_wx")){
            if (parameters.get("mobile")==null){
                if ("1".equalsIgnoreCase(isNeedGeet)){
                    String geetestChallenge = parameters.get("geetestChallenge");
@@ -2613,7 +2613,7 @@ public class WlyyLoginEndpoint extends AbstractEndpoint {
        if (StringUtils.isEmpty(client_id)) {
            throw new InvalidRequestException("client_id");
        }
        if (wechatId.equalsIgnoreCase("xm_ihealth_wx")){
        if (!StringUtils.isEmpty(wechatId)&&wechatId.equalsIgnoreCase("xm_ihealth_wx")){
            List<NameValuePair> params = new ArrayList<>();
            params.add(new BasicNameValuePair("clientId", userDetailsService.getClientId()));
            ClientDetails clientDetails = clientDetailsService.loadClientByClientId(userDetailsService.getClientId());

svr/svr-internet-hospital-entrance/src/main/resources/application.yml

@@ -627,7 +627,7 @@ spring:
  profiles: hcyyProd
  datasource:
    driver-class-name: oracle.jdbc.driver.OracleDriver
    url: jdbc:oracle:thin:@10.95.100.10:1521/hcyy
    url: jdbc:oracle:thin:@192.168.120.102:1521/hcyy
    username: NET
    password: zy02v4NT
  jpa:

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -3770,5 +3770,24 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
        }
    }
    @PostMapping("/updateOutpatient")
    @ApiOperation(value = "更新门诊记录", notes = "更新门诊记录")
    public Envelop updateOupatient(
            @ApiParam(name = "outpatientId", value = "门诊id")
            @RequestParam(value = "outpatientId", required = false) String outpatientId,
            @ApiParam(name = "diseaseCode", value = "特殊病种code")
            @RequestParam(value = "diseaseCode", required = false) String diseaseCode,
            @ApiParam(name = "diseaseName", value = "特殊病种名称")
            @RequestParam(value = "diseaseName", required = false) String diseaseName,
            @ApiParam(name = "medicalState", value = "是否医保01")
            @RequestParam(value = "medicalState", required = false) String medicalState) {
        try {
            return success("操作成功", prescriptionService.updateOutpatient(outpatientId,diseaseCode,diseaseName,medicalState));
        } catch (Exception e) {
            return Envelop.getError(e.getMessage());
        }
    }
}