Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Account.java

@@ -35,7 +35,7 @@ public class Account extends HisBaseEntity {
     private Integer billingStatusEnum;
 
     /** 账户类型编码 */
-    private Integer typeCode;
+    private String typeCode;
 
     /** 名称 */
     private String name;

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Device.java

@@ -29,7 +29,7 @@ public class Device extends HisBaseEntity {
     private Long id;
 
     /** 器材编码 */
-    private Long deviceCode;
+    private String deviceCode;
 
     /** 器材定义编号 */
     private Long defId;

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java

@@ -38,7 +38,7 @@ public class Encounter extends HisBaseEntity {
     private String code;
 
     /** 状态编码 */
-    private Integer statusCode;
+    private String statusCode;
 
     /** 类别编码 */
     private Integer classEnum;

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterParticipant.java

@@ -32,7 +32,7 @@ public class EncounterParticipant extends HisBaseEntity {
     private Long encounterId;
 
     /** 参与者类型 */
-    private Integer typeCode;
+    private String typeCode;
 
     /** 开始时间 */
     private Date startTiem;

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterReason.java

@@ -32,7 +32,7 @@ public class EncounterReason extends HisBaseEntity {
     private Long encounterId;
 
     /** 原因编码 */
-    private Integer useCode;
+    private String useCode;
 
     /** 具体原因类型 */
     private String valueTable;

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/HealthcareService.java

@@ -35,7 +35,7 @@ public class HealthcareService extends HisBaseEntity {
     private Long offeredOrgId;
 
     /** 服务分类 */
-    private Integer categoryCode;
+    private String categoryCode;
 
     /** 服务类型 */
     private String typeCode;

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/Invoice.java

@@ -53,7 +53,7 @@ public class Invoice extends HisBaseEntity {
     private String paymentTerms;
 
     /** 账单批次号 */
-    private BigDecimal batchCode;
+    private String batchCode;
 
     /** 结算批次号 */
     private String qrCode;

openhis-server/openhis-domain/src/main/java/com/openhis/administration/domain/PatientIdentifier.java

@@ -29,7 +29,7 @@ public class PatientIdentifier extends HisBaseEntity {
     private Long id;
 
     /** 标识类型编码 */
-    private Integer typeCode;
+    private String typeCode;
 
     /** 标识号 */
     private String identifierNo;

openhis-server/openhis-domain/src/main/java/com/openhis/financial/domain/PaymentNotice.java

@@ -41,7 +41,7 @@ public class PaymentNotice extends HisBaseEntity {
     private Long payee;
 
     /** 通知方式 */
-    private Integer wayCode;
+    private String wayCode;
 
     /** 通知内容 */
     private String content;

openhis-server/openhis-domain/src/main/java/com/openhis/medication/domain/MedicationDefinition.java

@@ -50,7 +50,7 @@ public class MedicationDefinition extends HisBaseEntity {
     private String wbCode;
 
     /** 药品分类 */
-    private Integer categoryCode;
+    private String categoryCode;
 
     /** 商品名称 */
     private String merchandiseName;