中山结算优化

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

@@ -15366,7 +15366,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            }else {
                BigDecimal b1 = new BigDecimal(ylzMedicalRelationDO.getPersonCash());//个人现金
                BigDecimal b2 = new BigDecimal(ylzMedicalRelationDO.getPersonAccount());//个人账户
                BigDecimal b3 = new BigDecimal(ylzMedicalRelationDO.getMedicalPrice());//医保总金额
                BigDecimal b3 = new BigDecimal(StringUtils.isNoneBlank(ylzMedicalRelationDO.getMedicalPrice())?ylzMedicalRelationDO.getMedicalPrice():0+"");//医保总金额
                Double totalPirce=b1.add(b2).add(b3).doubleValue();
                logger.info("总费用:"+totalPirce);
                if (totalPirce!=Double.parseDouble(ylzMedicalRelationDO.getTotalAmount())){

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

@@ -4416,7 +4416,7 @@ public class EntranceService {
                        ylzMedicalRelationDO.setState(0);
                        ylzMedicalRelationDO.setRelationCode(outpatientDO.getId());
                        ylzMedicalRelationDO.setCreateTime(new Date());
//                        ylzMedicalRelationDO.setMedicalPrice("0");
                        ylzMedicalRelationDO.setMedicalPrice("0");
                        if (outpatientDO.getMedicalState()==null){
                            ylzMedicalRelationDO.setMedicalState(0);
                            ylzMedicalRelationDO.setPersonCash(resultJSON.getString("bcfyze"));
@@ -4566,7 +4566,7 @@ public class EntranceService {
                        ylzMedicalRelationDO.setDataSource("53");
                        ylzMedicalRelationDO.setPreCount(resultJSON.getString("cfxms0"));
                        ylzMedicalRelationDO.setBalance(cardFee+"");
//                        ylzMedicalRelationDO.setMedicalPrice("0");
                        ylzMedicalRelationDO.setMedicalPrice("0");
                        BaseDoctorDO baseDoctorDO = baseDoctorDao.findById(outpatientDO.getDoctor());
                        if (baseDoctorDO!=null){
                            String jobTitle = baseDoctorDO.getJobTitleCode();