今日挂号

app/src/main/java/com/eningqu/aipen/logic/model/medical/GhTodayBean.java

@@ -40,5 +40,38 @@ public class GhTodayBean implements Serializable {
         public String emrGhTime;
         @SerializedName("emrGhOrder")
         public String emrGhOrder;
+        @SerializedName("hzInfoEntity")
+        public HzInfoEntityDTO hzInfoEntity;
+
+        @NoArgsConstructor
+        @Data
+        public static class HzInfoEntityDTO implements Serializable{
+            @SerializedName("emrHzId")
+            public Integer emrHzId;
+            @SerializedName("emrHzPhone")
+            public String emrHzPhone;
+            @SerializedName("emrHzPwd")
+            public String emrHzPwd;
+            @SerializedName("emrHzName")
+            public String emrHzName;
+            @SerializedName("emrHzSex")
+            public String emrHzSex;
+            @SerializedName("emrHzAge")
+            public Integer emrHzAge;
+            @SerializedName("emrHzJob")
+            public String emrHzJob;
+            @SerializedName("emrHzBirth")
+            public String emrHzBirth;
+            @SerializedName("emrHzPlace")
+            public String emrHzPlace;
+            @SerializedName("emrHzCard")
+            public Object emrHzCard;
+            @SerializedName("emrHzMarry")
+            public String emrHzMarry;
+            @SerializedName("emrHzGm")
+            public Object emrHzGm;
+            @SerializedName("emrHzImg")
+            public String emrHzImg;
+        }
     }
 }

app/src/main/java/com/eningqu/aipen/logic/model/medical/PatientBean.java

@@ -2,7 +2,7 @@ package com.eningqu.aipen.logic.model.medical;
 
 import com.google.gson.annotations.SerializedName;
 
-import java.util.List;
+import java.io.Serializable;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -15,49 +15,43 @@ import lombok.NoArgsConstructor;
  */
 @NoArgsConstructor
 @Data
-public class PatientBean {
+public class PatientBean implements Serializable {
-
 
     @SerializedName("msg")
     public String msg;
     @SerializedName("code")
     public Integer code;
-    @SerializedName("page")
+    @SerializedName("emrHzInfo")
-    public PageDTO page;
+    public EmrHzInfoDTO emrHzInfo;
 
     @NoArgsConstructor
     @Data
-    public static class PageDTO {
+    public static class EmrHzInfoDTO implements Serializable{
-        @SerializedName("totalCount")
+        @SerializedName("emrHzId")
-        public Integer totalCount;
+        public Integer emrHzId;
-        @SerializedName("pageSize")
+        @SerializedName("emrHzPhone")
-        public Integer pageSize;
+        public String emrHzPhone;
-        @SerializedName("totalPage")
+        @SerializedName("emrHzPwd")
-        public Integer totalPage;
+        public String emrHzPwd;
-        @SerializedName("currPage")
+        @SerializedName("emrHzName")
-        public Integer currPage;
+        public String emrHzName;
-        @SerializedName("list")
+        @SerializedName("emrHzSex")
-        public List<ListDTO> list;
+        public String emrHzSex;
-
+        @SerializedName("emrHzAge")
-        @NoArgsConstructor
+        public Integer emrHzAge;
-        @Data
+        @SerializedName("emrHzJob")
-        public static class ListDTO {
+        public String emrHzJob;
-            @SerializedName("hzId")
+        @SerializedName("emrHzBirth")
-            public Integer hzId;
+        public String emrHzBirth;
-            @SerializedName("hzName")
+        @SerializedName("emrHzPlace")
-            public String hzName;
+        public String emrHzPlace;
-            @SerializedName("hzSex")
+        @SerializedName("emrHzCard")
-            public Boolean hzSex;
+        public Object emrHzCard;
-            @SerializedName("hzBirthDate")
+        @SerializedName("emrHzMarry")
-            public String hzBirthDate;
+        public String emrHzMarry;
-            @SerializedName("hzBirthPlace")
+        @SerializedName("emrHzGm")
-            public String hzBirthPlace;
+        public Object emrHzGm;
-            @SerializedName("hzCard")
+        @SerializedName("emrHzImg")
-            public String hzCard;
+        public String emrHzImg;
-            @SerializedName("hzMarry")
-            public String hzMarry;
-            @SerializedName("hzGm")
-            public String hzGm;
-        }
     }
 }

app/src/main/java/com/eningqu/aipen/logic/network/Apis.java

@@ -5,6 +5,7 @@ import com.eningqu.aipen.logic.model.chat.ChatResponseBean;
 import com.eningqu.aipen.logic.model.chat.ChatTokenBean;
 import com.eningqu.aipen.logic.model.medical.GhTodayBean;
 import com.eningqu.aipen.logic.model.medical.MedicalBean;
+import com.eningqu.aipen.logic.model.medical.PatientBean;
 import com.eningqu.aipen.logic.model.mine.DoctorBean;
 import com.eningqu.aipen.logic.model.write.WriteResponseBean;
 import com.eningqu.aipen.logic.model.medical.MedicalWithPatientBean;
@@ -146,6 +147,14 @@ public interface Apis {
     Observable<MedicalWithPatientBean> getTodayMedicalRx(@Query("ysId") Integer ysId);
 
 
+    /**
+     * 获取患者的个人信息
+     */
+    @GET("hospital/emrhzinfo/info/{}")
+    Observable<PatientBean.EmrHzInfoDTO> getHzInfo(@Path("emrHzId") Integer hzId);
+
+
+
     /**
      * 更新病历信息
      */

app/src/main/java/com/eningqu/aipen/ui/adapter/WorkAdapter.java

@@ -68,8 +68,8 @@ public class WorkAdapter extends RecyclerView.Adapter<WorkAdapter.WorkViewHolder
                 WriteActivity.startAction(v.getContext(), bundle);
             }
         });
-        holder.binding.tvName.setText(bean.emrHzId+"");
+        holder.binding.tvName.setText(bean.hzInfoEntity.emrHzName);
-        holder.binding.tvDate.setText(bean.emrGhTime.substring(0,11));
+        holder.binding.tvDate.setText(bean.emrGhTime.substring(0,11)+"\n"+bean.emrGhTime.substring(11));
         holder.binding.tvTest.setOnClickListener((View.OnClickListener) v->{
             if(MyApplication.isConnect==1){
                 holder.binding.tvTest.setText("测试按钮：模拟连接点阵笔");

app/src/main/java/com/eningqu/aipen/ui/home/HomeFragment.java

@@ -28,6 +28,7 @@ import com.eningqu.aipen.demo.activity.SDKMainActivity;
 import com.eningqu.aipen.demo.databinding.FragmentHomeBinding;
 import com.eningqu.aipen.logic.model.medical.GhTodayBean;
 import com.eningqu.aipen.logic.model.medical.MedicalWithPatientBean;
+import com.eningqu.aipen.logic.model.mine.DoctorBean;
 import com.eningqu.aipen.logic.network.Apis;
 import com.eningqu.aipen.logic.network.BaseRetrofitUtils;
 import com.eningqu.aipen.logic.network.RxLifecycle;
@@ -53,9 +54,12 @@ import com.tbruyelle.rxpermissions2.RxPermissions;
 import java.util.ArrayList;
 import java.util.List;
 
+import io.reactivex.ObservableSource;
 import io.reactivex.disposables.CompositeDisposable;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Consumer;
+import io.reactivex.functions.Function;
+import io.reactivex.schedulers.Schedulers;
 
 @SuppressWarnings("unused")
 public class HomeFragment extends BaseFragment<FragmentHomeBinding> {

app/src/main/java/com/eningqu/aipen/ui/mine/MineFragment.java

@@ -23,6 +23,10 @@ import com.eningqu.aipen.utils.GlobalConfig;
 import com.eningqu.aipen.utils.SPUtil;
 import com.kongzue.dialogx.dialogs.PopTip;
 
+import io.reactivex.ObservableSource;
+import io.reactivex.functions.Function;
+import io.reactivex.schedulers.Schedulers;
+
 /**
  * Package:com.eningqu.aipen.ui.mine
  * Author:starr

app/src/main/res/layout/item_work.xml

@@ -75,9 +75,10 @@
                     android:id="@+id/tv_date"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
                     android:text="12:00:00"
                     android:visibility="visible"
-                    app:layout_constraintStart_toStartOf="@+id/tv_time"
+                    app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/tv_time" />
 
                 <TextView