代码修改

business/base-service/src/main/java/com/yihu/jw/hospital/disease/service/BaseDiseaseHospitalService.java

@@ -208,7 +208,7 @@ public class BaseDiseaseHospitalService extends BaseJpaService<BaseDiseaseHospit
                " left join wlyy_survey_third t on ssr.code=t.survey_code and t.disease_code=s.id " +
                " WHERE ssr.is_over=1 and ssr.town='350212' ";
        if(StringUtils.isNotBlank(hospital)){
            filter += " and ssr.code='"+hospital+"' ";
            filter += " and ssr.hospital='"+hospital+"' ";
        }
        if(StringUtils.isNotBlank(diseaseCode)){
            if(diseaseCode.contains(",")){
@@ -217,7 +217,7 @@ public class BaseDiseaseHospitalService extends BaseJpaService<BaseDiseaseHospit
            }else {
                diseaseCode = " = '"+diseaseCode+"' ";
            }
            filter += " and s.id "+diseaseCode+" ";
            filter += " and s.survey_code "+diseaseCode+" ";
        }
        if (StringUtils.isNotBlank(patientName)){
            filter += " and (ssr.patient_name like '%" + patientName + "%' or ssr.idcard like '%" + patientName + "%')  ";
@@ -397,6 +397,11 @@ public class BaseDiseaseHospitalService extends BaseJpaService<BaseDiseaseHospit
            smsTemplateDO.setType(SmsTemplateDO.Type.login);
            smsTemplateDO.setCreateTime(new Date());
            smsTemplateDO.setUpdateTime(new Date());
        }else{
            if(!smsTemplateDO.getHeader().equals(header)||!smsTemplateDO.getContent().equals(content)){
                //如果修改了 标题或内存 则重新保存一条
                smsTemplateDO.setId(null);
            }
        }
        smsTemplateDO.setContent(content);
        smsTemplateDO.setHeader(header);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/specialist/BaseDiseaseHospitalController.java

@@ -164,15 +164,15 @@ public class BaseDiseaseHospitalController extends EnvelopRestEndpoint {
                                   @RequestParam(value = "jsonData", required = true) String jsonData,
                                   @ApiParam(name = "doctor", value = "医生code", required = false)
                                   @RequestParam(value = "doctor", required = false) String doctor,
                                   @ApiParam(name = "smsTemplateId", value = "短信模板id", required = false)
                                   @RequestParam(value = "smsTemplateId", required = false) String smsTemplateId,
                                   @ApiParam(name = "smsTemplate", value = "短信模板id", required = false)
                                   @RequestParam(value = "smsTemplate", required = false) String smsTemplate,
                                   @ApiParam(name = "content", value = "短信模板内容", required = true)
                                   @RequestParam(value = "content", required = true) String content) {
        try {
            if(StringUtils.isBlank(doctor)){
                doctor = getUID();
            }
            baseDiseaseHospitalService.sendSms(jsonData,smsTemplateId,content,header,doctor);
            baseDiseaseHospitalService.sendSms(jsonData,smsTemplate,content,header,doctor);
            return success("发送成功");
        } catch (Exception e) {
            return failedException(e);