新增字段

src/main/java/thyyxxk/webserver/dao/his/yibao/TransferInOfExpensesDao.java

@@ -24,7 +24,7 @@ public interface TransferInOfExpensesDao {
      * 查询患者的基本信息
      *
      * @param inpatientNo 住院号
-     * @return 返回一条信息
+     * @return 返回患者的住院信息
      */
     @Select("select rtrim(inpatient_no) inpatient_no,admiss_times,rtrim(zk_dept) zk_dept,ward,dept," +
             "rtrim(admiss_ward) wardCode," +

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyiji/YiJiFeiYongLuRuDao.java

@@ -31,6 +31,7 @@ public interface YiJiFeiYongLuRuDao {
             "       responce_type_name=(select rtrim(name) name from zy_zd_responce_type where responce_type = zy_zd_responce_type.code)," +
             "       balance," +
             "       dept," +
+            "       refer_physician," +
             "       total_charge," +
             "       rtrim(charge_type) charge_type," +
             "       times_billed," +

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

@@ -3,16 +3,15 @@ package thyyxxk.webserver.entity.datamodify;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * <p>
  *
@@ -36,7 +35,7 @@ public class YzActOrder implements Serializable {
 
     /**
      * 病人的姓名
-     * */
+     */
     @TableField(exist = false)
     private String patientName;
 
@@ -208,4 +207,31 @@ public class YzActOrder implements Serializable {
 
     private String consultPhysician;
 
+    @TableField(exist = false)
+    private long currentPage;
+    @TableField(exist = false)
+    private long pageSize;
+    @TableField(exist = false)
+    private String queryStartTime;
+    @TableField(exist = false)
+    private String queryEndTime;
+
+    public String getDrugFlagName() {
+        switch (drugFlag) {
+            case "d":
+                return "西药";
+            case "i":
+                return "大输液";
+            case "z":
+                return "中成药";
+            case "o":
+                return "医嘱";
+            case "p":
+                return "手术";
+            case "h":
+                return "护理";
+            default:
+                return "错误";
+        }
+    }
 }

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

@@ -127,6 +127,8 @@ public class ZyDetailCharge implements Serializable {
 
     private String spec;
 
+    private String yblx;
+
     private BigDecimal price;
 
     private BigDecimal amount;
@@ -224,7 +226,15 @@ public class ZyDetailCharge implements Serializable {
     private Integer itemNo;
 
     private String execUnitName;
+    /**
+     * 拼音码
+     */
     private String pyCode;
+    /**
+     * 五笔码
+     */
+    private String wbCode;
+
     private String dCode;
     private BigDecimal priceB;
 
@@ -244,6 +254,7 @@ public class ZyDetailCharge implements Serializable {
     private String dept;
     private String ward;
 
+
     /**
      * 费用类型 名称
      */