Sfoglia il codice sorgente

优化会诊申请里面查找科室

xiaochan 4 anni fa
parent
commit
2db9acc680

+ 14 - 4
src/main/java/thyyxxk/webserver/dao/his/casefrontsheet/HuiZhenShenQingDao.java

@@ -18,13 +18,15 @@ import java.util.List;
 public interface HuiZhenShenQingDao {
     /**
      * 获取科室
+     *
      * @return 返回科室
      */
-    @Select("select code,rtrim(name) name from zy_ward_code where py_code like #{pyCode}")
+    @Select("select code,rtrim(name) name from zy_ward_code where py_code like #{pyCode} or name like #{pyCode} or code like #{pyCode}")
     List<GetDropdownBox> getZdUnitCode(String pyCode);
 
     /**
      * 获取会诊类别
+     *
      * @return 返回科室
      */
     @Select("select code,rtrim(name) name from ysh_zd_hz_level")
@@ -38,6 +40,7 @@ public interface HuiZhenShenQingDao {
 
     /**
      * 查询医嘱
+     *
      * @return 返回医嘱号
      */
     @Select("select act_order_no from yz_sequence")
@@ -45,6 +48,7 @@ public interface HuiZhenShenQingDao {
 
     /**
      * 插入新的医嘱
+     *
      * @param actOrderNo 医嘱号
      */
     @Update("update yz_sequence set act_order_no = #{actOrderNo}")
@@ -52,6 +56,7 @@ public interface HuiZhenShenQingDao {
 
     /**
      * 插入会诊申请
+     *
      * @param param 要插入的实体类
      */
     @Insert("INSERT INTO ysh_hz_record  " +
@@ -63,6 +68,7 @@ public interface HuiZhenShenQingDao {
 
     /**
      * 查看是否有重复的
+     *
      * @param inpatientNo 住院号
      * @return 返回一条或者没有
      */
@@ -71,6 +77,7 @@ public interface HuiZhenShenQingDao {
 
     /**
      * 获取到最大的 req_times 每次插入都要加一
+     *
      * @param inpatientNo 住院号
      * @param admissTimes 住院次数
      * @return 返回最大的  req_times
@@ -82,6 +89,7 @@ public interface HuiZhenShenQingDao {
 
     /**
      * 插入一条医嘱
+     *
      * @param param 参数
      */
     @Insert("INSERT INTO yz_act_order ( order_code, order_name, frequ_code, infant_flag, order_time, physician, start_time,  " +
@@ -102,13 +110,14 @@ public interface HuiZhenShenQingDao {
             "inner join  a_employee_mi b on (code = input_id) " +
             "inner join ysh_zd_hz_level c on c.code = a.hz_level " +
             "where  inpatient_no = #{inpatientNo} and admiss_times = #{admissTimes} and status_flag = 1")
-    List<YshHzRecord> chaKanHuiZhenShenQing(@Param("inpatientNo") String inpatientNo,@Param("admissTimes") int admissTimes);
+    List<YshHzRecord> chaKanHuiZhenShenQing(@Param("inpatientNo") String inpatientNo, @Param("admissTimes") int admissTimes);
 
     /**
      * 删除 会诊申请
+     *
      * @param inpatientNo 住院号
      * @param admissTimes 住院次数
-     * @param reqTimes 申请次数
+     * @param reqTimes    申请次数
      */
     @Delete("delete ysh_hz_record where inpatient_no = #{inpatientNo} and admiss_times = #{admissTimes} and req_times = #{reqTimes}")
     void shanChuShenQing(@Param("inpatientNo") String inpatientNo,
@@ -117,10 +126,11 @@ public interface HuiZhenShenQingDao {
 
     /**
      * 删除医嘱
+     *
      * @param actOrderNo 医嘱号
      */
     @Delete("DELETE FROM yz_act_order WHERE act_order_no = #{actOrderNo} ")
-    void shanChuYiZhu(@Param("actOrderNo")float actOrderNo);
+    void shanChuYiZhu(@Param("actOrderNo") float actOrderNo);
 
 
     @Select("select code,name from a_employee_mi where dept_code = #{deptCode} and emp_tit_code = #{hzType} and isnull(del_flag,0)=0")

+ 2 - 1
src/main/java/thyyxxk/webserver/service/casefrontsheet/HuiZhenShenQingService.java

@@ -9,6 +9,7 @@ import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.casefrontsheet.YshHzRecord;
 import thyyxxk.webserver.entity.datamodify.GetDropdownBox;
 import thyyxxk.webserver.utils.ResultVoUtil;
+import thyyxxk.webserver.utils.StringUtil;
 import thyyxxk.webserver.utils.TokenUtil;
 
 import java.util.Date;
@@ -45,7 +46,7 @@ public class HuiZhenShenQingService {
      * @return 返回科室
      */
     public ResultVo<List<GetDropdownBox>> queryDept(String code) {
-        return ResultVoUtil.success(dao.getZdUnitCode("%" + code.toUpperCase() + "%"));
+        return ResultVoUtil.success(dao.getZdUnitCode(StringUtil.isContainChinese(code)));
     }
 
     /**