Browse Source

id 从 数字换成 string

xiaochan 3 years ago
parent
commit
43e7d691b5

+ 6 - 3
src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/YiZhuLuRuDao.java

@@ -87,7 +87,8 @@ public interface YiZhuLuRuDao {
 
     @Select("<script>" +
             "select rowIndex, " +
-            "       act_order_no, " +
+            "       act_order_no," +
+            "       cast(cast(act_order_no as decimal) as varchar) id, " +
             "       order_code, " +
             "       order_name, " +
             "       rtrim(frequ_code) frequ_code," +
@@ -554,7 +555,8 @@ public interface YiZhuLuRuDao {
                          @Param("muBanLeiXing") Integer muBanLeiXing);
 
 
-    @Select("SELECT                 act_order_no        id, " +
+    @Select("SELECT                 cast(cast(act_order_no as decimal) as varchar) id, " +
+            "                       act_order_no,  " +
             "                       rtrim(a.order_name) order_name, " +
             "                       rtrim(a.order_code) order_code, " +
             "                       a.frequ_code, " +
@@ -597,7 +599,8 @@ public interface YiZhuLuRuDao {
             "  and isnull(a.group_no, '00') = '00' " +
             "  and a.order_code = b.order_code " +
             "UNION " +
-            "SELECT                 act_order_no as id, " +
+            "SELECT                 cast(cast(act_order_no as decimal) as varchar) id," +
+            "                       act_order_no,  " +
             "                       a.order_name, " +
             "                       a.order_code, " +
             "                       a.frequ_code, " +

+ 3 - 100
src/main/java/thyyxxk/webserver/entity/datamodify/YzActOrder.java

@@ -36,216 +36,122 @@ public class YzActOrder implements Serializable {
     private String orderGroup;
 
     private BigDecimal actOrderNo;
-
     private BigDecimal actOrderNoTf;
-
     private String inpatientNo;
-
     /**
      * 病人的姓名
      */
     private String patientName;
-
-
     private Integer admissTimes;
-
     private String orderCode;
-
     private Date orderTime;
-
     private String frequCode;
     private String frequCodeName;
-
     private Date enterTime;
-
     private String enterOper;
-
     private Date startTime;
-
     private Date endTime;
-
     private String startTimeString;
-
     private String endTimeString;
-
     /**
      * 停止人
      */
     private String modifier;
     private String modifierName;
-
     private String infantFlag;
-
     private String drugFlag;
-
     private String supplyCode;
-
     private String supplyCodeName;
-
     private Date performanceTime;
-
     /**
      * 录入人
      */
     private String physician;
-
     private String physicianName;
-
     private Date confirmTime;
-
     /**
      * 确认人
      */
     private String signer;
     private String signerName;
-
     private String statusFlag;
-
     private Date statusTime;
-
     private BigDecimal drugQuan;
     private String drugQuanName;
-
     private String instruction;
-
     private String drugSpecification;
-
     private String miniUnit;
     private String miniUnitName;
-
     private Float drugWeight;
-
     private String drugWeightUnit;
-
     private String printOrderChange;
-
     private BigDecimal parentNo;
-
     private String selfBuy;
-
-
     private String eatCardFlag;
-
     private BigDecimal drugVolume;
-
     private String drugVolUnit;
-
     private BigDecimal dose;
-
     private String doseUnit;
     private String doseUnitName;
-
     private BigDecimal drugOcc;
-
     private String printOrder;
-
     private String printOrderOnce;
-
     private String printOrderAnew;
-
     private String printInfusion;
-
     private Date excluBackTime;
-
     private Float excluActOrderNo;
-
     private String orderName;
-
     private String discription;
-
     private String delFlag;
-
     private String paySelf;
-
     private String serial;
     private String serialName;
-
     private String groupNo;
     private String groupNoName;
-
     private String wardCode;
-
     private String ybSelfFlag;
-
     private String doctorFlag;
-
     private String deptCode;
-
     private String execUnit;
     private String execUnitName;
-
     private String clCode;
-
     private String zySerialNo;
-
     private String executer1;
-
     private String executer2;
-
     private String regFlag;
-
     private String msgFlag;
-
     private Date execTime;
-
     private String execId;
-
     private String psStatus;
-
     private String psOper;
     private Date psTime;
-
     private String execId2;
-
     private BigDecimal actOrderNo2;
-
     private float newActOrderNo;
-
     private Integer printPage;
-
     private Integer printPageOnce;
-
     private String printOrderChangeEnd;
-
     private String emergencyFlag;
-
     private String reqReceiveFlag;
-
     private String inspectStuff;
-
     private String chargeStatus;
-
     private Date psResultTime;
-
     private String opIdCode;
-
     private Date chargeDate;
-
     private String kfFlag;
-
     private String modifierOper;
-
     private String passFlag;
-
     private String passId;
-
     private String passDate;
-
     private String passComment;
-
     private String referPhysician;
-
     private String consultPhysician;
-
     private List<YzActOrder> tuiFeiList;
-
     private Integer tfFlag;
-
     private long currentPage;
     private long pageSize;
     private String queryStartTime;
     private String queryEndTime;
-
     // 下面是医嘱确费 需要使用到的
     private Integer ledgerSn;
     private String name;
@@ -272,27 +178,24 @@ public class YzActOrder implements Serializable {
     private long total;
     private String opIdName;
     private Date opDate;
-
     private Integer fenLei;
     private Integer shiFouYouChuYuanYiZhu;
     private Integer liShi;
-
     private Integer yiQueRen;
     private Integer quXiao;
     private Integer weiQueRen;
     private Integer yiChanShenFeiYong;
-
     private Boolean isChildren = false;
-
-
     /**
      * 抗菌药物 专用 需要在 yz_act_record_kss 中插入
      */
     private String kjywFlag;
+
     /**
      * 取模板时候的 id
      */
-    private BigDecimal id;
+    private String id;
+
 
     /* 费用标志 自备标志 1 自备 2 嘱托 3 基数药 */
     public String getSelfBuyName() {

+ 1 - 1
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -672,7 +672,7 @@ public class YiZhuLuRuServer {
             if (item.getParentNo() == null) {
                 tree.add(item);
             }
-            map.put(item.getId(), item);
+            map.put(item.getActOrderNo(), item);
         }
         for (YzActOrder item : muBanShuJu) {
             YzActOrder yzActOrder = map.get(item.getParentNo());