代码修改

business/base-service/src/main/java/com/yihu/jw/hospital/dict/WlyyHospitalSysDictDao.java

@@ -21,6 +21,9 @@ public interface WlyyHospitalSysDictDao extends JpaRepository<WlyyHospitalSysDic
    @Query("from WlyyHospitalSysDictDO where dictName = ?1  and  dictCode is null order by sort asc")
    List<WlyyHospitalSysDictDO> findByDictNameNotNull(String dictName);
    @Query("from WlyyHospitalSysDictDO where dictName = ?1  and  dictCode is not null order by sort asc")
    List<WlyyHospitalSysDictDO> findByDictNameSort(String dictName);
    @Query("from WlyyHospitalSysDictDO where dictName = ?1 ")
    List<WlyyHospitalSysDictDO> findByDictName(String dictName);
    @Query("from WlyyHospitalSysDictDO where 1=1")

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

@@ -2,6 +2,7 @@ package com.yihu.jw.hospital.prescription.service;
import com.alibaba.fastjson.JSONObject;
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.BaseNatItemDao;
@@ -93,4 +94,53 @@ public class NatService {
        return PageEnvelop.getSuccessListWithPage("查询成功",list,page,size,count);
    }
    //核酸预约记录分页
    public PageEnvelop natAppointmentPage(String name,String payStatus,String merchantOrderNo,String invoiceSerialNo,String medicare,String cardNo
            ,String createTimeStart,String createTimeEnd,String appointmentTimeStart,String appointmentTimeEnd,Integer page,Integer size){
        String sql = "select * ";
        String countSql = "select count(*) ";
        String filter = " from base_nat_appointment where 1=1 ";
        if(StringUtils.isNotBlank(name)){
            filter += " and name like '%"+name+"%'";
        }
        if(StringUtils.isNotBlank(payStatus)){
            filter += " and pay_status = '"+payStatus+"'";
        }
        if(StringUtils.isNotBlank(merchantOrderNo)){
            filter += " and merchant_order_no like '%"+merchantOrderNo+"%'";
        }
        if(StringUtils.isNotBlank(invoiceSerialNo)){
            filter += " and invoice_serial_no like '%"+invoiceSerialNo+"%'";
        }
        if(StringUtils.isNotBlank(medicare)){
            filter += " and medicare like '%"+medicare+"%'";
        }
        if(StringUtils.isNotBlank(cardNo)){
            filter += " and card_no like '%"+cardNo+"%'";
        }
        if(StringUtils.isNotBlank(createTimeStart)){
            filter += " and create_time >= '"+createTimeStart+"'";
        }
        if(StringUtils.isNotBlank(createTimeEnd)){
            filter += " and create_time <= '"+createTimeEnd+"'";
        }
        if(StringUtils.isNotBlank(appointmentTimeStart)){
            filter += " and appointment_time >= '"+appointmentTimeStart+"'";
        }
        if(StringUtils.isNotBlank(appointmentTimeEnd)){
            filter += " and appointment_time <= '"+appointmentTimeEnd+"'";
        }
        String orderBy = " order by id desc limit "+(page-1)*size+","+size;
        List<BaseNatAppointmentDO> list = jdbcTemplate.query(sql+filter+orderBy,new BeanPropertyRowMapper<>(BaseNatAppointmentDO.class));
        List<WlyyHospitalSysDictDO> dictDOList =  wlyyHospitalSysDictDao.findByDictName("PRESCRIPTION_PAY_STATUS");
        Map<String,String> statusMap = dictDOList.stream().collect(Collectors.toMap(WlyyHospitalSysDictDO::getDictCode,WlyyHospitalSysDictDO::getDictValue));
        list.stream().forEach(one->{
            one.setPayStatusName(statusMap.get(one.getPayStatus()));
        });
        Long count = jdbcTemplate.queryForObject(countSql+filter,Long.class);
        return PageEnvelop.getSuccessListWithPage("查询成功",list,page,size,count);
    }
}

common/common-entity/src/db/2023.sql

@@ -658,3 +658,9 @@ INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('time_type2', NULL, 'time_type', '2', '每周', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '时段设置');
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('time_type3', NULL, 'time_type', '3', '每月', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '时段设置');
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('time_type4', NULL, 'time_type', '4', '每年', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '时段设置');
ALTER table base_nat_appointment add COLUMN `merchant_order_no` varchar (50) DEFAULT NULL COMMENT '商户订单号';
ALTER table base_nat_appointment add COLUMN `invoice_serial_no` varchar (50) DEFAULT NULL COMMENT '发票流水号';

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

@@ -2,68 +2,74 @@ package com.yihu.jw.entity.hospital.prescription;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.SequenceGenerator;
import javax.persistence.Table;
import javax.persistence.*;
import java.util.Date;
@Entity
@Table(name = "base_nat_appointment")
@SequenceGenerator(name="id_generated", sequenceName="BASE_NAT_APPOINTMENT_SEQ")
public class BaseNatAppointmentDO extends IntegerIdentityEntity {
    private String cardType;
    private String cardNo;
    private Date appointmentTime;
    private String isSuccess;
    private String appointmentTode;
    private Date endTime;
    private Date createTime;
    private String address;
    private String province;
    private String provinceName;
    private String city;
    private String cityName;
    private String town;
    private String townName;
    private String street;
    private String streetName;
    private String name;
    private String mobile;
    private String payStatus;
    private String realOrder;
    private String inspectionCode;
    private String inspectionName;
    private String dept;
    private String deptName;
    private String doctorId;
    private String patientId;
    private String chargeAmount;
    private String cancelBy;
    private String cancelReson;
    private Date cancelTime;
    private String secondJobCode;
    private String secondJobName;
    private String firstJobCode;
    private String firstJobName;
    private String medicare;
    private String checkPart;
    private String chargeFlag;
    private String winNo;
    private String chargeCode;
    private String icdCode;
    private String doctorName;
    private String voucherNo;
    private String registerNo;
    private String ampm;
    private String cardNoType;
    private String hospitalFlag;
    private String consumer;
    private String consumerName;
    private String oderNum;
    private String idnoType;
    private Integer source;
    private String patientHisId;
    private String cardType;//
    private String cardNo;//
    private Date appointmentTime;//预约时间
    private String isSuccess;//1成功  0失败
    private String appointmentTode;//预约号
    private Date endTime;//结束时间
    private Date createTime;//创建时间
    private String address;//具体地址
    private String province;//省编码
    private String provinceName;//
    private String city;//市
    private String cityName;//
    private String town;//区
    private String townName;//
    private String street;//街道
    private String streetName;//
    private String name;//患者姓名
    private String mobile;//患者手机号
    private String payStatus;//支付状态
    private String realOrder;//处方code
    private String inspectionCode;//检查项目code
    private String inspectionName;//检查项目名称
    private String dept;//
    private String deptName;//部门名称
    private String doctorId;//医生id
    private String patientId;//患者id
    private String chargeAmount;//单价
    private String cancelBy;//取消人id
    private String cancelReson;//取消原因
    private Date cancelTime;//取消时间
    private String secondJobCode;//职业二级分类
    private String secondJobName;//
    private String firstJobCode;//职业一级分类
    private String firstJobName;//
    private String medicare;//就诊卡号（社保卡号、智慧卡号）
    private String checkPart;//检查部位
    private String chargeFlag;//
    private String winNo;//
    private String chargeCode;//号别
    private String icdCode;//诊断code
    private String doctorName;//医生姓名
    private String voucherNo;//
    private String registerNo;//
    private String ampm;//
    private String cardNoType;//
    private String hospitalFlag;//
    private String consumer;//代就诊人
    private String consumerName;//代就诊人名字
    private String oderNum;//
    private String idnoType;//身份类别
    private Integer source;//来源（1二维码2、公众号、3支付宝、4pc端）
    private String patientHisId;//患者his的id
    private String merchantOrderNo;//商户订单号
    private String invoiceSerialNo;//发票流水号
    //非数据字段
    private String payStatusName;//支付状态
    private String age;//年龄
    private String sex;//性别
    public String getOderNum() {
        return oderNum;
@@ -482,4 +488,47 @@ public class BaseNatAppointmentDO extends IntegerIdentityEntity {
    public void setPatientHisId(String patientHisId) {
        this.patientHisId = patientHisId;
    }
    public String getMerchantOrderNo() {
        return merchantOrderNo;
    }
    public void setMerchantOrderNo(String merchantOrderNo) {
        this.merchantOrderNo = merchantOrderNo;
    }
    public String getInvoiceSerialNo() {
        return invoiceSerialNo;
    }
    public void setInvoiceSerialNo(String invoiceSerialNo) {
        this.invoiceSerialNo = invoiceSerialNo;
    }
    @Transient
    public String getPayStatusName() {
        return payStatusName;
    }
    public void setPayStatusName(String payStatusName) {
        this.payStatusName = payStatusName;
    }
    @Transient
    public String getAge() {
        return age;
    }
    public void setAge(String age) {
        this.age = age;
    }
    @Transient
    public String getSex() {
        return sex;
    }
    public void setSex(String sex) {
        this.sex = sex;
    }
}