中山结算优化

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

@@ -12275,6 +12275,12 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                    wlyyHttpLogDO.setResponse(jsonObject.toString());
                    if(jsonObject.getString("@RESULT").equalsIgnoreCase("-1")){
                        throw new Exception(jsonObject.getString("@MSG"));
                    }else {
                        prescriptionDO.setStatus(-4);
                        prescriptionDO.setDisableTime(new Date());
                        prescriptionDO.setCheckStatus(5);
                        prescriptionDO.setCheckReason("已作废");
                        prescriptionDao.save(prescriptionDO);
                    }
                }catch (Exception e){
                    e.printStackTrace();
@@ -12285,13 +12291,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                wlyyHttpLogDO.setCreateTime(new Date());
                wlyyHttpLogDO.setCode(outpatientDO.getId());
                wlyyHttpLogDao.save(wlyyHttpLogDO);
                for (WlyyPrescriptionDO wlyyPrescriptionDO:prescriptionDOList){
                    wlyyPrescriptionDO.setStatus(-4);
                    wlyyPrescriptionDO.setDisableTime(new Date());
                    wlyyPrescriptionDO.setCheckStatus(5);
                    wlyyPrescriptionDO.setCheckReason("已作废");
                    prescriptionDao.save(wlyyPrescriptionDO);
                }
            }
            prescriptionDO.setStatus(-4);
            prescriptionDO.setDisableTime(new Date());

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

@@ -3684,7 +3684,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"));
@@ -3834,7 +3834,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();
@@ -4035,7 +4035,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"));
@@ -4185,7 +4185,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();
@@ -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();