瀏覽代碼

修改bug

wangzhinan 8 月之前
父節點
當前提交
336cb2443e

+ 1 - 1
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/DsyyPrescriptionService.java

@ -291,7 +291,7 @@ public class DsyyPrescriptionService extends BaseJpaService<WlyyPrescriptionDO,
     * @throws Exception
     * @throws Exception
     */
     */
    public JSONArray findCardNo(String patient,boolean demoFlag) throws Exception {
    public JSONArray findCardNo(String patient,boolean demoFlag) throws Exception {
        BasePatientDO patientDO = patientDao.getOne(patient);
        BasePatientDO patientDO = patientDao.findById(patient).get();
        if (patientDO==null){
        if (patientDO==null){
            throw new Exception("不存在该患者!");
            throw new Exception("不存在该患者!");
        }
        }

+ 2 - 2
business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/DsyyEntranceService.java

@ -3604,7 +3604,7 @@ public class DsyyEntranceService {
        if (doctorMappingDO == null){
        if (doctorMappingDO == null){
            return "医生信息映射表为空";
            return "医生信息映射表为空";
        }
        }
        WlyyOutpatientDO outpatientDO =outpatientDao.getOne(outpatientId);
        WlyyOutpatientDO outpatientDO =outpatientDao.findById(outpatientId).get();
        if(outpatientDO==null){
        if(outpatientDO==null){
            return "就诊记录为空!";
            return "就诊记录为空!";
        }
        }
@ -3613,7 +3613,7 @@ public class DsyyEntranceService {
        List<BaseDoctorHospitalDO> baseDoctorHospitalDOList = baseDoctorHospitalDao.findByDoctorCode(doctor);
        List<BaseDoctorHospitalDO> baseDoctorHospitalDOList = baseDoctorHospitalDao.findByDoctorCode(doctor);
        BaseDoctorHospitalDO baseDoctorHospitalDO = baseDoctorHospitalDOList.get(0);
        BaseDoctorHospitalDO baseDoctorHospitalDO = baseDoctorHospitalDOList.get(0);
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findByIdAndDel(doctor);
        BaseDoctorDO baseDoctorDO = baseDoctorDao.findByIdAndDel(doctor);
        BasePatientDO patientDO = patientDao.getOne(patient);
        BasePatientDO patientDO = patientDao.findById(patient).get();
        Double recipeFeeTotal = 0.00;
        Double recipeFeeTotal = 0.00;
        for (int i = 0; i < infos.size(); i++) {
        for (int i = 0; i < infos.size(); i++) {
            Double packRetprice = infos.get(i).getPackRetprice();
            Double packRetprice = infos.get(i).getPackRetprice();

+ 2 - 2
business/base-service/src/main/java/com/yihu/jw/hospital/survey/service/SurveyService.java

@ -560,7 +560,7 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
     * @return
     * @return
     */
     */
    public Boolean delSurveyTemplate(String tempId) {
    public Boolean delSurveyTemplate(String tempId) {
        WlyySurveyTemplateDO temp = surveyTemplateDao.getOne(tempId);
        WlyySurveyTemplateDO temp = surveyTemplateDao.findById(tempId).orElse(null);
        if (temp != null) {
        if (temp != null) {
            //删除原有问题
            //删除原有问题
            List<WlyySurveyTemplateQuestionDO> questionDODels = surveyTemplateQuestionDao.findByTemplateCodeAndDelOrderBySortAsc(temp.getId(), "1");
            List<WlyySurveyTemplateQuestionDO> questionDODels = surveyTemplateQuestionDao.findByTemplateCodeAndDelOrderBySortAsc(temp.getId(), "1");
@ -770,7 +770,7 @@ public class SurveyService extends BaseJpaService<WlyySurveyQuestionDO, SurveyQu
     */
     */
    public WlyySurveyTemplateVO findSurveyTemplateResult(String tempId) {
    public WlyySurveyTemplateVO findSurveyTemplateResult(String tempId) {
        WlyySurveyTemplateDO templateDO = surveyTemplateDao.getOne(tempId);
        WlyySurveyTemplateDO templateDO = surveyTemplateDao.findById(tempId).orElse(null);
        WlyySurveyTemplateVO templateVO = convertToModel(templateDO, WlyySurveyTemplateVO.class);
        WlyySurveyTemplateVO templateVO = convertToModel(templateDO, WlyySurveyTemplateVO.class);
        templateVO.setLabels(findSurveyTemplateLabel(tempId));
        templateVO.setLabels(findSurveyTemplateLabel(tempId));
        templateVO.setInsplabels(findSurveyInspTemplateLabel(tempId));
        templateVO.setInsplabels(findSurveyInspTemplateLabel(tempId));

+ 1 - 1
svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/channel/RemindDoctorService.java

@ -49,7 +49,7 @@ public class RemindDoctorService {
    public void sendSystemMessage() {
    public void sendSystemMessage() {
        try {
        try {
            List<WlyyOutpatientDO> list = outpatientDao.findDoctorRemindMessage();
            List<WlyyOutpatientDO> list = outpatientDao.findDoctorRemindMessage();
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.getOne("isCirculation");//是否重复提醒
            WlyyHospitalSysDictDO wlyyHospitalSysDictDO = wlyyHospitalSysDictDao.findById("isCirculation").get();//是否重复提醒
            List<WlyyHospitalSysDictDO> dictDOS =wlyyHospitalSysDictDao.findByDictNameAndDictCode("RECEPTION_REMINDER","time");
            List<WlyyHospitalSysDictDO> dictDOS =wlyyHospitalSysDictDao.findByDictNameAndDictCode("RECEPTION_REMINDER","time");
            Long doctorRemindTime =0l;
            Long doctorRemindTime =0l;
            if (dictDOS!=null&&dictDOS.size()>0){
            if (dictDOS!=null&&dictDOS.size()>0){