查询已匹配项目时显示匹配时使用的院内名称。

src/main/java/thyyxxk/webserver/dao/his/xmyp/XmYpDao.java

@@ -29,7 +29,7 @@ public interface XmYpDao {
 
     @Select("select rtrim(b.code) hisCode,rtrim(b.name) hisName," +
             "rtrim(a.yb_code) ybCode, rtrim(a.yb_name) ybName, " +
-            "rtrim(pack_retprice) price," +
+            "rtrim(pack_retprice) price, a.his_name as hisName2," +
             "dosage=(select rtrim(name) from yp_zd_dosage where code=b.dosage), " +
             "rtrim(b.pzwh) approvalNumber, rtrim(b.specification) specification, " +
             "hisUnit=(select rtrim(name) from yp_zd_unit where code=pack_unit), " +
@@ -54,15 +54,15 @@ public interface XmYpDao {
 
     @Select("select rtrim(b.code) hisCode,rtrim(b.name) hisName, " +
             "rtrim(a.yb_code) ybCode, rtrim(a.yb_name) ybName, " +
-            "rtrim(b.charge_amount) price," +
+            "rtrim(b.charge_amount) price, a.his_name as hisName2, " +
             "rtrim(b.charge_unit) hisUnit " +
             "from zd_cssyb_xmdz a right join " +
             "zd_charge_item b on b.code=a.his_code where a.his_code is not null")
     List<XmYpDetail> queryMatchedCssybHisXm();
 
-    @Select("select yb_code ybCode, yb_name ybName, charge_level chargeLevel, " +
-            "max_price maxPrice,injury_flag injuryFlag, start_date startDate, " +
-            "charge_type chargeType, itemType='2', end_date endDate from zd_cssyb_zlxm")
+    @Select("select yb_code, yb_name, charge_level, " +
+            "max_price,injury_flag, start_date, " +
+            "charge_type, itemType='2', end_date from zd_cssyb_zlxm")
     List<XmYpDetail> queryCssybXm();
 
     @Update("update zd_cssyb_xmdz set his_name=#{name} where his_code=#{code}")

src/main/java/thyyxxk/webserver/entity/xmyp/XmYpDetail.java

@@ -2,6 +2,9 @@ package thyyxxk.webserver.entity.xmyp;
 
 import lombok.Data;
 
+/**
+ * @author dj
+ */
 @Data
 public class XmYpDetail {
     private String ybCode;
@@ -10,14 +13,19 @@ public class XmYpDetail {
     private String itemType;
     private String hisCode;
     private String hisName;
+    private String hisName2;
     private String dosage;
     private String price;
     private String startDate;
     private String endDate;
-    private String hisUnit; // 单位 必填
-    private String specification; // 规格 西药、中成药、材料必填
-    private String factory; // 厂家 西药、中成药、材料必填
-    private String approvalNumber; // 批准文号 西药、中成药、材料必填
+    // 单位 必填
+    private String hisUnit;
+    // 规格 西药、中成药、材料必填
+    private String specification;
+    // 厂家 西药、中成药、材料必填
+    private String factory;
+    // 批准文号 西药、中成药、材料必填
+    private String approvalNumber;
 
     private Integer chargeLevel;
     private String chargeLevelName;