zjh 本地 2024/06/25 --1

zjh

2024-06-25 d6caa33b757fcb2f32b693b5db3c0398e96194a3

zjh 本地 2024/06/25 --1

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java

@@ -445,9 +445,8 @@
                if (null != tjCustomer) {
                    order.setTjCustomerSex(tjCustomer.getCusSex());
                    order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
                    order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
                    order.setTjCustomerName(tjCustomer.getCusName());
                    order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
                    order.setTjCustomerPhone(tjCustomer.getCusPhone());
//                    order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
                    order.setTjCusIdCard(tjCustomer.getCusIdcard());
                    order.setCareer(tjCustomer.getCareer());

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TjPackageMapper.java

@@ -76,10 +76,10 @@
    public TjPackage getTjPackageByPacId(String pacId);


    @Select("SELECT * FROM  tj_package WHERE  !locate(\"女\",pac_name) and !locate(\"孕\",pac_name) and !locate(\"妇\",pac_name) and !locate(\"产\",pac_name) and pac_status=0 AND deleted =0 ORDER BY sort DESC")
    @Select("SELECT * FROM  tj_package WHERE  !locate(\"女\",pac_name) and !locate(\"孕\",pac_name) and !locate(\"妇\",pac_name) and !locate(\"产\",pac_name) and pac_status=0 AND deleted =0 ORDER BY sort")
    List<TjPackage> getTjPackageListByMan();

    @Select("SELECT * FROM  tj_package WHERE  !locate(\"男\",pac_name) and pac_status=0 AND deleted =0 ORDER BY sort DESC")
    @Select("SELECT * FROM  tj_package WHERE  !locate(\"男\",pac_name) and pac_status=0 AND deleted =0 ORDER BY sort")
    List<TjPackage> getTjPackageListByWoMan();


@@ -94,7 +94,7 @@
            "on b.pro_id=c.pro_id\n" +
            "WHERE  !locate(\"女\",a.pac_name) and !locate(\"孕\",a.pac_name) and !locate(\"妇\",a.pac_name) and !locate(\"产\",a.pac_name) and a.pac_status=0 AND a.deleted =0  and a.pac_name like concat('%',#{name},'%')\n" +
            "GROUP BY a.pac_id\n" +
            "ORDER BY a.sort DESC;\n")
            "ORDER BY a.sort;\n")
    List<TjPackage> getPacListBySqlAndMan(String pacName);

    @Select("SELECT a.pac_id,a.pac_name,a.price,GROUP_CONCAT(distinct c.pro_name SEPARATOR ',') AS allProName\n" +
@@ -105,7 +105,7 @@
            "on b.pro_id=c.pro_id\n" +
            "WHERE  !locate(\"男\",a.pac_name) and a.pac_status=0 AND a.deleted =0  and a.pac_name like concat('%',#{name},'%')\n" +
            "GROUP BY a.pac_id\n" +
            "ORDER BY a.sort DESC;\n")
            "ORDER BY a.sort;\n")
    List<TjPackage> getPacListBySqlAndWomen(String pacName);


@@ -118,7 +118,7 @@
            "    on b.pro_id=c.pro_id\n" +
            "    WHERE   a.pac_status=0 AND a.deleted =0  and a.pac_name like concat('%',#{name},'%')\n" +
            "    GROUP BY a.pac_id\n" +
            "    ORDER BY a.sort DESC;")
            "    ORDER BY a.sort;")
    List<TjPackage> getPacListBySqlAndAll(String pacName);