新增厂家

src/main/java/thyyxxk/webserver/dao/his/inpatient/XiangMuLuRuDao.java

@@ -291,7 +291,9 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
      */
     @Select("SELECT charge_name=RTRIM(b.name), " +
             "       charge_code_mx=b.code, " +
-            "       amount=a.amount, " +
+            "       amount=a.amount," +
+            "       rtrim(b.yb_comment) as yb_comment," +
+            "       rtrim(b.yb_comment) as manu_name, " +
             "       charge_amount=b.charge_amount, " +
             "       op_id_code=a.op_id_code, " +
             "       bill_item_code=b.bill_item_zy, " +
@@ -310,7 +312,9 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "union all " +
             "SELECT charge_name=RTRIM(d.name), " +
             "       charge_code_mx=b.charge_code, " +
-            "       amount=a.amount, " +
+            "       amount=a.amount," +
+            "       '' as yb_comment," +
+            "       manu_name = (select name from yp_zd_manufactory where yp_zd_manufactory.code = manu_code),  " +
             "       charge_amount=d.pack_retprice, " +
             "       op_id_code=a.op_id_code, " +
             "       bill_item_code=d.bill_item_zy, " +
@@ -342,7 +346,8 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
     @Select("SELECT a.code charge_code," +
             "       a.code charge_code_mx, " +
             "       a.exec_unit dept_code," +
-            "       rtrim(a.yb_comment) yb_comment, " +
+            "       rtrim(a.yb_comment) as  yb_comment," +
+            "       rtrim(a.yb_comment) as manu_name," +
             "       RTRIM(a.name) charge_name, " +
             "       a.charge_amount," +
             "       amount = 1, " +
@@ -356,7 +361,6 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
             "       self_flag =isnull(a.self_flag,'0'), " +
             "       a.separate_flag , " +
             "       spec=charge_unit, " +
-            "       a.yb_comment, " +
             "       exec_unit_name=b.name, " +
             "       serial='00', " +
             "       group_no='00'," +
@@ -372,7 +376,8 @@ public interface XiangMuLuRuDao extends BaseMapper<ZyDetailCharge> {
 
     @Select("SELECT distinct a.code charge_code_mx, " +
             "                charge_code = (select charge_code from zy_bill_item where a.bill_item_zy = zy_bill_item.code), " +
-            "                a.serial, " +
+            "                a.serial," +
+            "                manu_name = (select name from yp_zd_manufactory where yp_zd_manufactory.code = manu_code), " +
             "                RTRIM(a.name) charge_name, " +
             "                a.pack_size amount, " +
             "                charge_amount=a.pack_retprice, " +

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/PatientCriticalValuesDao.java

@@ -45,5 +45,4 @@ public interface PatientCriticalValuesDao {
     @Select("select message from t_patient_critical_value where pat_no = #{patNo} and times =#{times}")
     List<String> selectCriticalValueByPatInfo(String patNo, Integer times);
 
-
 }

src/main/java/thyyxxk/webserver/entity/datamodify/ZyDetailCharge.java

@@ -370,6 +370,11 @@ public class ZyDetailCharge implements Serializable {
      */
     private String miniUnit;
 
+    /**
+     * 厂家
+     */
+    private String manuName;
+
 
     public BigDecimal getOrderNo() {
         if (orderNo == null) {