代码修改

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

@@ -1,12 +1,16 @@
package com.yihu.jw.hospital.prescription.service;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.prescription.BaseNatAppointmentDO;
import com.yihu.jw.entity.hospital.prescription.BaseNatItemDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.hospital.prescription.dao.BaseNatAppointmentDao;
import com.yihu.jw.hospital.prescription.dao.BaseNatItemDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.util.common.IdCardUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -27,9 +31,13 @@ public class NatService {
    @Autowired
    private BaseNatItemDao natItemDao;
    @Autowired
    private BaseNatAppointmentDao natAppointmentDao;
    @Autowired
    private WlyyHospitalSysDictDao wlyyHospitalSysDictDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private BasePatientDao patientDao;
    //新增或修改医技预约项目
@@ -53,6 +61,7 @@ public class NatService {
        BaseNatItemDO natItemDO = natItemDao.findById(id).orElse(null);
        if(natItemDO!=null){
            WlyyHospitalSysDictDO dictDO = wlyyHospitalSysDictDao.findOneByDictNameAndDictCode("isEffect",natItemDO.getStatus());
            natItemDO.setStatusName(dictDO.getDictValue());
        }
        return natItemDO;
    }
@@ -143,4 +152,25 @@ public class NatService {
        return PageEnvelop.getSuccessListWithPage("查询成功",list,page,size,count);
    }
    //核酸预约记录详情
    public BaseNatAppointmentDO natAppointmentDetail(Integer id){
        BaseNatAppointmentDO appointmentDO = natAppointmentDao.findById(id).orElse(null);
        WlyyHospitalSysDictDO dictDO = wlyyHospitalSysDictDao.findOneByDictNameAndDictCode("PRESCRIPTION_PAY_STATUS",appointmentDO.getPayStatus());
        appointmentDO.setPayStatusName(dictDO.getDictValue());
        BasePatientDO patientDO = patientDao.findById(appointmentDO.getPatientId()).orElse(null);
        if(patientDO!=null){
            String sex = "未知";
            if(patientDO.getSex()==null){
                sex = "未知";
            }else if(patientDO.getSex() == 1){
                sex = "男";
            }else if(patientDO.getSex() == 2){
                sex = "女";
            }
            appointmentDO.setSex(sex);
            appointmentDO.setAge(IdCardUtil.getAgeByBirthdayOrIdcard(patientDO.getIdcard(),patientDO.getBirthday())+"");
        }
        return appointmentDO;
    }
}

business/base-service/src/main/java/com/yihu/jw/hospital/suggest/service/BaseSuggestionService.java

@@ -7,6 +7,7 @@ import com.yihu.jw.hospital.suggest.dao.BaseSuggestionDao;
import com.yihu.jw.hospital.suggest.dao.BaseSuggestionDictDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.entity.ServiceException;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
@@ -89,7 +90,17 @@ public class BaseSuggestionService extends BaseJpaService<BaseSuggestionDO, Base
        BaseSuggestionDictDO baseSuggestionDictDO = baseSuggestionDictDao.findById(baseSuggestionDO.getSuggestId()).orElse(null);
        baseSuggestionDO.setSuggestName(baseSuggestionDictDO.getSuggestName());
        return baseSuggestionDO;
    }
    //撤回功能
    public BaseSuggestionDO revoke(String id){
        BaseSuggestionDO baseSuggestionDO = baseSuggestionDao.findById(id).orElse(null);
        if(baseSuggestionDO.getSuggestStatus()!=0){
            throw new ServiceException("只有未处理的建议才能撤回");
        }
        baseSuggestionDO.setSuggestStatus(2);
        baseSuggestionDao.save(baseSuggestionDO);
        return baseSuggestionDO;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/BaseNatAppointmentDO.java

@@ -11,7 +11,7 @@ import java.util.Date;
public class BaseNatAppointmentDO extends IntegerIdentityEntity {
    private String cardType;//
    private String cardNo;//
    private String cardNo;//证件号
    private Date appointmentTime;//预约时间
    private String isSuccess;//1成功  0失败
    private String appointmentTode;//预约号

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/suggest/BaseSuggestionDO.java

@@ -52,7 +52,7 @@ public class BaseSuggestionDO extends UuidIdentityEntityWithOperator {
    @Column(name = "is_del")
    private Integer  isDel;
    /*
     *状态图 1回复 0未回复
     *状态图 1回复 0未回复 2已撤回
     */
    @Column(name = "suggest_status")
    private Integer  suggestStatus;

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/BasicZuulFilter.java

@@ -424,32 +424,17 @@ public class BasicZuulFilter extends ZuulFilter {
    private static boolean sqlValidate(String str) {
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(str)){
            logger.info("sql"+str);
            str = str.toLowerCase();//统一转为小写,比较简单的单词加入右边空格，避免单词中包含字段
            String badStr = "xor|sysdate|and |exec |execute |insert |select |delete |update |drop |chr |mid |master |truncate |" +
                    "declare | sitename |net user|xp_cmdshell|or |exec |execute |create |" +
                    "table |from |grant |use |group_concat|column_name|" +
                    "information_schema.columns|table_schema|union |where |select |update |order |by |like |" ;//过滤掉的sql关键字，可以手动添加
            String[] badStrs = badStr.split("\\|");
            for (int i = 0; i < badStrs.length; i++) {
                if (str.indexOf(badStrs[i]) >= 0) {
                    logger.info("true");
                    return true;
                }
            }
            return false;
            String badStr = "xor|sysdate|and|exec|execute|insert|select|delete|update|drop|chr|mid|master|truncate|" +
                    "declare|sitename|net user|xp_cmdshell|or|create|" +
                    "table|from|grant|use|group_concat|column_name|" +
                    "information_schema.columns|table_schema|union|where|order|by|like|" ;//过滤掉的sql关键字，可以手动添加
            return str.matches(badStr);
        }else {
            return true;
        }
    }
//    public static void main(String ag[]){
//        String str ="<?xml version='1.0' encoding='UTF-8'?><Request service=\"RoutePushService\" lang=\"zh-CN\"><Body><WaybillRoute id=\"4771647\" mailno=\"444019056680\" orderid=\"808080eb6c26bcad016c2826b9d6f794\" acceptTime=\"2019-11-26 12:21:46\" acceptAddress=\"深圳市\" remark=\"备注\" opCode=\"50\"/></Body></Request>";
//        sqlValidate(str);
//    }
    /**
     * 文件类型过滤器
     * @param fileName

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

@@ -1,13 +1,12 @@
package com.yihu.jw.hospital.endpoint.hospital;
import com.yihu.jw.entity.base.doctor.BaseDoctorBackgroundDO;
import com.yihu.jw.entity.hospital.message.BaseBannerDO;
import com.yihu.jw.entity.hospital.suggest.BaseSuggestionDO;
import com.yihu.jw.hospital.suggest.service.BaseSuggestionService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.util.entity.ServiceException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -18,8 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
@RestController
@RequestMapping(value = BaseHospitalRequestMapping.suggestion.suggestionManage)
@Api(value = "反馈建议", description = "反馈建议", tags = {"互联网医院 - 反馈建议"})
@@ -99,4 +96,18 @@ public class BaseSuggestionController extends EnvelopRestEndpoint {
            return failedException(e);
        }
    }
    @PostMapping(value= "revoke")
    @ApiOperation("撤回功能")
    public Envelop revoke(
            @ApiParam(name = "id", value = "建议id", required = true)
            @RequestParam(value = "id", required = true)String id) {
        try {
            return success(baseSuggestionService.revoke(id));
        }catch (ServiceException se){
            return Envelop.getError(se.getMessage());
        }catch (Exception e){
            return failedException(e);
        }
    }
}

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

@@ -90,4 +90,52 @@ public class NatEndpoint extends EnvelopRestEndpoint {
        return PageEnvelop.getError(CommonContant.Message.GET_ERROR);
    }
    @GetMapping(value = "natAppointmentPage")
    @ApiOperation(value = "核酸预约记录分页")
    public PageEnvelop natAppointmentPage (
            @ApiParam(name = "name", value = "患者姓名")
            @RequestParam(value = "name", required = false) String name,
            @ApiParam(name = "payStatus", value = "状态")
            @RequestParam(value = "payStatus", required = false) String payStatus,
            @ApiParam(name = "merchantOrderNo", value = "商户订单号")
            @RequestParam(value = "merchantOrderNo", required = false) String merchantOrderNo,
            @ApiParam(name = "invoiceSerialNo", value = "发票流水号")
            @RequestParam(value = "invoiceSerialNo", required = false) String invoiceSerialNo,
            @ApiParam(name = "medicare", value = "就诊卡号")
            @RequestParam(value = "medicare", required = false) String medicare,
            @ApiParam(name = "cardNo", value = "身份证")
            @RequestParam(value = "cardNo", required = false) String cardNo,
            @ApiParam(name = "createTimeStart", value = "申请开始时间")
            @RequestParam(value = "createTimeStart", required = false) String createTimeStart,
            @ApiParam(name = "createTimeEnd", value = "申请结束时间")
            @RequestParam(value = "createTimeEnd", required = false) String createTimeEnd,
            @ApiParam(name = "appointmentTimeStart", value = "预约开始时间")
            @RequestParam(value = "appointmentTimeStart", required = false) String appointmentTimeStart,
            @ApiParam(name = "appointmentTimeEnd", value = "预约结束时间")
            @RequestParam(value = "appointmentTimeEnd", required = false) String appointmentTimeEnd,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") Integer page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") Integer size) {
        try {
            return natService.natAppointmentPage(name, payStatus, merchantOrderNo, invoiceSerialNo, medicare, cardNo,
                    createTimeStart, createTimeEnd, appointmentTimeStart, appointmentTimeEnd, page, size);
        }catch (Exception e){
            e.printStackTrace();
        }
        return PageEnvelop.getError(CommonContant.Message.GET_ERROR);
    }
    @GetMapping(value = "natAppointmentDetail")
    @ApiOperation(value = "核酸预约记录详情")
    public ObjEnvelop natAppointmentDetail (
            @ApiParam(name = "id", value = "id")
            @RequestParam(value = "id", required = true) Integer id) {
        try {
            return ObjEnvelop.getSuccess("获取成功",natService.natAppointmentDetail(id));
        }catch (Exception e){
            e.printStackTrace();
        }
        return ObjEnvelop.getError(CommonContant.Message.GET_ERROR);
    }
}