客户二维码住院流水号改成使用手机号

android_bed/src/main/h7_3128/java/com/wdkl/app/ncs/callingbed/fragment/MainFragment.kt

@@ -71,19 +71,19 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainView2LayoutBinding>(
         }
         if (!TextUtils.isEmpty(customInfo.cardNo)) {
             tv_custom_card_no.text = StringUtil.getResString(R.string.card_no) + customInfo.cardNo
-
-            Thread {
-                //客户二维码: BC+住院号
-                val builder = StringBuilder()
-                builder.append("BC")
-                builder.append(customInfo.cardNo)
-                val code = EcodeHelper().createQRImage(builder.toString(),200, null)
-                activity.runOnUiThread {
-                    view_custom_qr_code?.setImageBitmap(code)
-                }
-            }.start()
         }
 
+        Thread {
+            //客户二维码: BC+住院号
+            val builder = StringBuilder()
+            builder.append("BC")
+            builder.append(customInfo.mobile)
+            val code = EcodeHelper().createQRImage(builder.toString(),200, null)
+            activity.runOnUiThread {
+                view_custom_qr_code?.setImageBitmap(code)
+            }
+        }.start()
+
         if (Constant.doctorValid == 1) {
             ll_doctor_view.visibility = View.VISIBLE
             tv_doctor_title.text = Constant.doctorTitle

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/vo/CustomerInfoVO.java

@@ -42,6 +42,10 @@ public class CustomerInfoVO implements Serializable {
     @Column(name = "named")
     @ApiModelProperty(name = "病人的名字")
     private String named;
+
+    @ApiModelProperty(name = "手机号")
+    private String mobile;
+
     /**
      * 病人的年龄
      */
@@ -108,19 +112,41 @@ public class CustomerInfoVO implements Serializable {
     @ApiModelProperty(value="医嘱",required=false)
     private String advice;
 
-    private Integer sex;
+    /**
+     * 经纬度
+     */
+    @Column(name = "lng_lat")
+    @ApiModelProperty(value = "经纬度", required = false)
+    private String lngLat;
 
-    private String roleName;
+    /**
+     * 预交费用
+     */
+    @Column(name = "advance_fee_pay")
+    @ApiModelProperty(value = "预交费用", required = false)
+    private Double advanceFeePay;
 
-    private String nurseConfigName;
+    /**
+     * 已使用费用
+     */
+    @Column(name = "used_fee")
+    @ApiModelProperty(value = "已使用费用", required = false)
+    private Double usedFee;
+
+    /**
+     * 剩余费用，负数为欠费
+     */
+    @Column(name = "remain_fee")
+    @ApiModelProperty(value = "剩余费用，负数为欠费", required = false)
+    private Double remainFee;
 
-    private String examinationGroupName;
+    private Integer sex;
 
-    private String examinationKeyName;
+    private Long birthday;
 
-    private String feeGroupName;
+    private String roleName;
 
-    private String feeKeyName;
+    private String nurseConfigName;
 
     private Integer doctorMappingId;
 
@@ -140,6 +166,24 @@ public class CustomerInfoVO implements Serializable {
 
     private String workerName;
 
+    private String doctorFace;
+
+    private String nurseFace;
+
+    private String workerFace;
+
+    private String face;
+
+    private String address;
+
+    private String frameName;
+
+    private String frameAlias;
+
+    private String nickname;
+
+    private String uuid;
+
     private List<NurseConfigDto> list;
 
     public Integer getId() {
@@ -246,6 +290,14 @@ public class CustomerInfoVO implements Serializable {
         this.sex = sex;
     }
 
+    public Long getBirthday() {
+        return birthday;
+    }
+
+    public void setBirthday(Long birthday) {
+        this.birthday = birthday;
+    }
+
     public Integer getFrameId() {
         return frameId;
     }
@@ -286,52 +338,44 @@ public class CustomerInfoVO implements Serializable {
         this.workerName = workerName;
     }
 
-    public String getRoleName() {
-        return roleName;
+    public String getDoctorFace() {
+        return doctorFace;
     }
 
-    public void setRoleName(String roleName) {
-        this.roleName = roleName;
+    public void setDoctorFace(String doctorFace) {
+        this.doctorFace = doctorFace;
     }
 
-    public String getNurseConfigName() {
-        return nurseConfigName;
+    public String getNurseFace() {
+        return nurseFace;
     }
 
-    public void setNurseConfigName(String nurseConfigName) {
-        this.nurseConfigName = nurseConfigName;
-    }
-
-    public String getExaminationGroupName() {
-        return examinationGroupName;
-    }
-
-    public void setExaminationGroupName(String examinationGroupName) {
-        this.examinationGroupName = examinationGroupName;
+    public void setNurseFace(String nurseFace) {
+        this.nurseFace = nurseFace;
     }
 
-    public String getExaminationKeyName() {
-        return examinationKeyName;
+    public String getWorkerFace() {
+        return workerFace;
     }
 
-    public void setExaminationKeyName(String examinationKeyName) {
-        this.examinationKeyName = examinationKeyName;
+    public void setWorkerFace(String workerFace) {
+        this.workerFace = workerFace;
     }
 
-    public String getFeeGroupName() {
-        return feeGroupName;
+    public String getRoleName() {
+        return roleName;
     }
 
-    public void setFeeGroupName(String feeGroupName) {
-        this.feeGroupName = feeGroupName;
+    public void setRoleName(String roleName) {
+        this.roleName = roleName;
     }
 
-    public String getFeeKeyName() {
-        return feeKeyName;
+    public String getNurseConfigName() {
+        return nurseConfigName;
     }
 
-    public void setFeeKeyName(String feeKeyName) {
-        this.feeKeyName = feeKeyName;
+    public void setNurseConfigName(String nurseConfigName) {
+        this.nurseConfigName = nurseConfigName;
     }
 
     public Integer getDoctorMappingId() {
@@ -397,4 +441,92 @@ public class CustomerInfoVO implements Serializable {
     public void setMemberId(Integer memberId) {
         this.memberId = memberId;
     }
+
+    public String getFace() {
+        return face;
+    }
+
+    public void setFace(String face) {
+        this.face = face;
+    }
+
+    public String getFrameName() {
+        return frameName;
+    }
+
+    public void setFrameName(String frameName) {
+        this.frameName = frameName;
+    }
+
+    public String getMobile() {
+        return mobile;
+    }
+
+    public void setMobile(String mobile) {
+        this.mobile = mobile;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getNickname() {
+        return nickname;
+    }
+
+    public void setNickname(String nickname) {
+        this.nickname = nickname;
+    }
+
+    public String getLngLat() {
+        return lngLat;
+    }
+
+    public void setLngLat(String lngLat) {
+        this.lngLat = lngLat;
+    }
+
+    public String getFrameAlias() {
+        return frameAlias;
+    }
+
+    public void setFrameAlias(String frameAlias) {
+        this.frameAlias = frameAlias;
+    }
+
+    public String getUuid() {
+        return uuid;
+    }
+
+    public void setUuid(String uuid) {
+        this.uuid = uuid;
+    }
+
+    public Double getAdvanceFeePay() {
+        return advanceFeePay;
+    }
+
+    public void setAdvanceFeePay(Double advanceFeePay) {
+        this.advanceFeePay = advanceFeePay;
+    }
+
+    public Double getUsedFee() {
+        return usedFee;
+    }
+
+    public void setUsedFee(Double usedFee) {
+        this.usedFee = usedFee;
+    }
+
+    public Double getRemainFee() {
+        return remainFee;
+    }
+
+    public void setRemainFee(Double remainFee) {
+        this.remainFee = remainFee;
+    }
 }