提交merge1.3

openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientFeeDetail.java

@@ -218,7 +218,7 @@ public class InpatientFeeDetail extends HisBaseEntity implements Serializable {
     /**
      * 关联就诊id
      */
-    private String encounterId;
+    private Long encounterId;
 
     private String inputParam;
 

openhis-server-new/openhis-domain/src/main/java/com/openhis/yb/domain/InpatientReg.java

@@ -259,4 +259,9 @@ public class InpatientReg extends HisBaseEntity implements Serializable {
     private String inputParam;
 
     private String outputResult;
+
+    /**
+     * 状态
+     */
+    private Integer status;
 }