吸毒人员

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/normal/CensusRegisterDetailActivity.java

@@ -13,6 +13,7 @@ import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
 import com.sucstepsoft.cm_utils.utils.UserLgUtils;
 import com.sucstepsoft.realtimelocation.R;
 import com.sucstepsoft.realtimelocation.activitys.census.special.CensusCorrctListActivity;
+import com.sucstepsoft.realtimelocation.activitys.census.special.CensusDrugListActivity;
 import com.sucstepsoft.realtimelocation.activitys.census.special.CensusSecurityListActivity;
 import com.sucstepsoft.realtimelocation.activitys.census.special.CensusSpecialCriminalListActivity;
 import com.sucstepsoft.realtimelocation.beans.OperateBean;
@@ -256,11 +257,13 @@ public class CensusRegisterDetailActivity extends BaseActivity {
                     intent.setClass(mActivity, CensusSecurityListActivity.class);
                     startActivity(intent);
                     break;
-                case "5":
+                case "5"://吸毒人员
+                    intent.setClass(mActivity, CensusDrugListActivity.class);
+                    startActivity(intent);
                     break;
-                case "6":
+                case "6"://涉邪人员
                     break;
-                case "7":
+                case "7"://重点上访
                     break;
 
             }

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusDrugAddActivity.java

@@ -2,16 +2,12 @@ package com.sucstepsoft.realtimelocation.activitys.census.special;
 
 import android.app.ProgressDialog;
 import android.graphics.Color;
-import android.os.Bundle;
-import android.support.v7.widget.CardView;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
-import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.Switch;
 import android.widget.TextView;
 
 import com.bigkoo.pickerview.builder.OptionsPickerBuilder;
@@ -28,16 +24,12 @@ import com.sucstepsoft.cm_utils.utils.UIUtil;
 import com.sucstepsoft.cm_utils.utils.UserLgUtils;
 import com.sucstepsoft.realtimelocation.R;
 import com.sucstepsoft.realtimelocation.beans.DicBean;
-import com.sucstepsoft.realtimelocation.beans.SearchBaseInfoBean;
 import com.sucstepsoft.realtimelocation.beans.SuccessBean;
-import com.sucstepsoft.realtimelocation.beans.person.CorrectDetailBean;
+import com.sucstepsoft.realtimelocation.beans.person.BaseRegisterDetailBean;
 import com.sucstepsoft.realtimelocation.beans.person.DrugDetailBean;
-import com.sucstepsoft.realtimelocation.beans.person.SaveCorrectBean;
 import com.sucstepsoft.realtimelocation.beans.person.SaveDrugBean;
 import com.sucstepsoft.realtimelocation.net.LocationApiService;
-import com.sucstepsoft.realtimelocation.services.jpush.TagAliasOperatorHelper;
 import com.sucstepsoft.realtimelocation.utils.ExceptionHandler;
-import com.sucstepsoft.realtimelocation.utils.ReadAssets;
 
 import java.text.SimpleDateFormat;
 import java.util.List;
@@ -45,7 +37,6 @@ import java.util.List;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.Unbinder;
-import io.reactivex.Observable;
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.annotations.NonNull;
@@ -58,73 +49,72 @@ import okhttp3.RequestBody;
  * 特殊人群-吸毒人员
  */
 public class CensusDrugAddActivity extends BaseActivity {
-    //搜索布局
-    @BindView(R.id.ll_search_content)
-    LinearLayout mLlSearchContent;
     @BindView(R.id.et_search_id_card)
-    EditText mEtSearchIdCard;//搜索框
+    EditText mEtSearchIdCard;
-    @BindView(R.id.btn_search)
-    Button mBtnSearch;//收搜按钮
     @BindView(R.id.iv_clear)
     ImageView mIvClear;
-    //基础信息
+    @BindView(R.id.btn_search)
-    @BindView(R.id.cv_base_info)
+    Button mBtnSearch;
-    CardView mCvBaseInfo;//基础信息
+    @BindView(R.id.ll_search_content)
+    LinearLayout mLlSearchContent;
     @BindView(R.id.tv_base_name)
     TextView mTvBaseName;
     @BindView(R.id.tv_base_gender)
     TextView mTvBaseGender;
-    @BindView(R.id.tv_base_native)
-    TextView mTvBaseNative;
     @BindView(R.id.tv_base_phone)
     TextView mTvBasePhone;
+    @BindView(R.id.tv_base_native)
+    TextView mTvBaseNative;
     @BindView(R.id.tv_base_cur_loc)
     TextView mTvBaseCurLoc;
-    //详情
+    @BindView(R.id.cv_base_info)
+    LinearLayout mCvBaseInfo;
     @BindView(R.id.tv_first_date)
-    TextView mTvFirstDate;//初次发现日期
+    TextView mTvFirstDate;
     @BindView(R.id.tv_control_case)
-    TextView mTvControlCase;//管控情况
+    TextView mTvControlCase;
-    @BindView(R.id.et_control_name)
-    EditText mEtControlName;//管控人姓名
     @BindView(R.id.et_control_phone)
-    EditText mEtControlPhone;//管控人联系方式
+    EditText mEtControlPhone;
-    @BindView(R.id.et_help_case)
+    @BindView(R.id.tv_help_status)
-    EditText mEtHelpCase;//帮扶情况
+    TextView mTvHelpStatus;
-    @BindView(R.id.et_help_name)
-    EditText mEtHelpName;//帮扶人姓名
     @BindView(R.id.et_help_phone)
-    EditText mEtHelpPhone;//帮扶人联系方式
+    EditText mEtHelpPhone;
-    @BindView(R.id.sw_is_crime)
+    @BindView(R.id.tv_crime_status)
-    Switch mSwIsCrime;//有无犯罪历史
+    TextView mTvCrimeStatus;
-    @BindView(R.id.et_crime_case)
-    EditText mEtCrimeCase;//犯罪情况
     @BindView(R.id.tv_drug_case)
-    TextView mTvDrugCase;//吸毒原因
+    TextView mTvDrugCase;
+    @BindView(R.id.et_drug_case)
+    EditText mEtDrugCase;
     @BindView(R.id.tv_drug_after)
-    TextView mTvDrugAfter;//吸毒后果
+    TextView mTvDrugAfter;
     @BindView(R.id.btn_confirm)
     Button mBtnConfirm;
     @BindView(R.id.ll_content)
     LinearLayout mLlContent;
+    //搜索布局
 
 
     private SimpleDateFormat mDateFormat = new SimpleDateFormat("yyyy-MM-dd");
     private Unbinder mBind;
     private String mId;
-    private SearchBaseInfoBean mBaseInfoBean;
+    private BaseRegisterDetailBean mBaseInfoBean;
 
     private List<DicBean> mControlList;
     private List<DicBean> mDrugCaseList;
     private List<DicBean> mAfterDrugList;
+    private List<DicBean> mCrimeList;
+    private List<DicBean> mHelpList;
 
     private OptionsPickerView<DicBean> mControlPicker;
+    private OptionsPickerView<DicBean> mCrimePicker;
+    private OptionsPickerView<DicBean> mHelpPicker;
     private OptionsPickerView<DicBean> mDrugCasePicker;
     private OptionsPickerView<DicBean> mAfterDrugPicker;
     private boolean mIsCrime = false;
     private String mSelControlCase;
     private String mSelDrugCase;
     private String mSelDrugAfter;
+    private String mIdCard;
 
     @Override
     protected int setLayoutId() {
@@ -137,6 +127,7 @@ public class CensusDrugAddActivity extends BaseActivity {
         mLlContent.setVisibility(View.INVISIBLE);
         //主键
         mId = getIntent().getStringExtra("id");
+        mIdCard = getIntent().getStringExtra("idCard");
         String title = getIntent().getStringExtra("title");
         if (!TextUtils.isEmpty(mId)) {
             //编辑
@@ -145,7 +136,7 @@ public class CensusDrugAddActivity extends BaseActivity {
             getDetailById(mId);
         } else {
             //新增
-            mLlSearchContent.setVisibility(View.VISIBLE);
+            mLlSearchContent.setVisibility(View.GONE);
             refreshView(STATE_LOAD_SUCCESS);
         }
         mTvBaseTitle.setText(title);
@@ -156,8 +147,89 @@ public class CensusDrugAddActivity extends BaseActivity {
         mTvDrugCase.setOnClickListener(v -> onShowDrugCase());
         mTvDrugAfter.setOnClickListener(v -> onShowAfterDrug());
         mTvFirstDate.setOnClickListener(v -> onShowDate(1));
+        mTvHelpStatus.setOnClickListener(v -> onShowHelp());
+        mTvCrimeStatus.setOnClickListener(v -> onShowCrime());
+        getPersonDetail();
+    }
 
-        mSwIsCrime.setOnCheckedChangeListener((buttonView, isChecked) -> mIsCrime = isChecked);
+    private void onShowCrime() {
+        hideSoftKeyboard();
+        if (mCrimeList != null && mCrimeList.size() > 0) {
+            if (mCrimePicker == null) {
+                mCrimePicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> {
+                    DicBean bean = mCrimeList.get(o1);
+                    mTvCrimeStatus.setText(bean.getDictionaryName());
+                })
+                        .setTitleText("请选择")
+                        .setCancelColor(Color.parseColor("#1189FF"))
+                        .setSubmitColor(Color.parseColor("#1189FF"))
+                        .setTitleColor(Color.parseColor("#1189FF"))
+                        .build();
+                mCrimePicker.setPicker(mCrimeList);
+            }
+            mCrimePicker.show();
+        } else {
+            getDicListByType(PathConfig.DIC_DRUG_CRIME, 4);
+        }
+    }
+
+    /**
+     * 帮扶qingk
+     */
+    private void onShowHelp() {
+        hideSoftKeyboard();
+        if (mHelpList != null && mHelpList.size() > 0) {
+            if (mHelpPicker == null) {
+                mHelpPicker = new OptionsPickerBuilder(mActivity, (o1, o2, o3, v) -> {
+                    DicBean bean = mHelpList.get(o1);
+                    mTvHelpStatus.setText(bean.getDictionaryName());
+                })
+                        .setTitleText("请选择")
+                        .setCancelColor(Color.parseColor("#1189FF"))
+                        .setSubmitColor(Color.parseColor("#1189FF"))
+                        .setTitleColor(Color.parseColor("#1189FF"))
+                        .build();
+                mHelpPicker.setPicker(mHelpList);
+            }
+            mHelpPicker.show();
+        } else {
+            getDicListByType(PathConfig.DIC_DRUG_HELP, 5);
+        }
+    }
+
+    /**
+     * 获取人员详情
+     */
+    private void getPersonDetail() {
+        RetrofitManager.getInstance()
+                .create(LocationApiService.class)
+                .getBaseRegisterDetail(mIdCard, UserLgUtils.getToken())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribeOn(Schedulers.io())
+                .subscribe(new Observer<BaseRegisterDetailBean>() {
+                    @Override
+                    public void onSubscribe(Disposable d) {
+
+                    }
+
+                    @Override
+                    public void onNext(BaseRegisterDetailBean baseRegisterDetailBean) {
+                        //设置基础信息
+                        setBaseInfo(baseRegisterDetailBean);
+                        refreshView(STATE_LOAD_SUCCESS);
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        refreshView(STATE_LOAD_ERROR);
+                        ExceptionHandler.handleException(e);
+                    }
+
+                    @Override
+                    public void onComplete() {
+
+                    }
+                });
     }
 
     /**
@@ -185,27 +257,6 @@ public class CensusDrugAddActivity extends BaseActivity {
         }
     }
 
-//    private void getDicListLoc(String s, int i) {
-//        List<DicBean> tempList = ReadAssets.getAssetsDic(s, mActivity);
-//        if (tempList != null && tempList.size() > 0) {
-//            switch (i) {
-//                case 1:
-//                    mControlList = tempList;
-//                    onShowControlCase();
-//                    break;
-//                case 2:
-//                    mDrugCaseList = tempList;
-//                    onShowDrugCase();
-//                    break;
-//                case 3:
-//                    mAfterDrugList = tempList;
-//                    onShowAfterDrug();
-//                    break;
-//            }
-//        } else {
-//            ToastUtils.showShort("暂无数据");
-//        }
-//    }
 
     /**
      * 吸毒原因
@@ -319,6 +370,14 @@ public class CensusDrugAddActivity extends BaseActivity {
                                     mAfterDrugList = typeListBeans;
                                     onShowAfterDrug();
                                     break;
+                                case 4://犯罪情况
+                                    mCrimeList = typeListBeans;
+                                    onShowCrime();
+                                    break;
+                                case 5://帮扶情况
+                                    mHelpList = typeListBeans;
+                                    onShowHelp();
+                                    break;
                             }
                         } else {
                             ToastUtils.showShort("暂无数据");
@@ -417,37 +476,25 @@ public class CensusDrugAddActivity extends BaseActivity {
 
     private RequestBody buildParams() {
         SaveDrugBean bean = new SaveDrugBean();
-        bean.setIdCardNumber(mBaseInfoBean.getIdCardNumber());
+        bean.setPopulationInfoId(mBaseInfoBean.getPopulationInfoId());
-
         String firstDate = mTvFirstDate.getText().toString().trim();
-        bean.setDiscoveryDate(firstDate);
+        bean.setStartTime(firstDate);
         String controlCase = mTvControlCase.getText().toString().trim();
-        bean.setControlInfo(mSelControlCase);
+        bean.setControl(controlCase);
-        String controlName = mEtControlName.getText().toString().trim();
-        bean.setControlUserName(controlName);
         String controlPhone = mEtControlPhone.getText().toString().trim();
-        bean.setControlUserPhone(controlPhone);
+        bean.setControlPhone(controlPhone);
-        String helpCase = mEtHelpCase.getText().toString().trim();
+        String helpCase = mTvHelpStatus.getText().toString().trim();
-        if (!TextUtils.isEmpty(helpCase)) {
+        bean.setHelp(helpCase);
-            bean.setHelpInfo(helpCase);
-        }
-        String helpName = mEtHelpName.getText().toString().trim();
-        bean.setHelpUserName(helpName);
         String helpPhone = mEtHelpPhone.getText().toString().trim();
-        bean.setHelpUserPhone(helpPhone);
+        bean.setHelpPhone(helpPhone);
-        bean.setHasCrimeHis(mIsCrime ? "1" : "0");
+        String crimieStatue = mTvCrimeStatus.getText().toString().trim();
-        String crimeCase = mEtCrimeCase.getText().toString().trim();
+        bean.setCharge(crimieStatue);
-        if (!TextUtils.isEmpty(crimeCase)) {
-            bean.setCrimeInfo(crimeCase);
-        }
         String drugCase = mTvDrugCase.getText().toString().trim();
-        if (!TextUtils.isEmpty(drugCase)) {
+        bean.setReason(drugCase);
-            bean.setDrugReason(mSelDrugCase);
+        String drugOther = mEtDrugCase.getText().toString().trim();
-        }
+        bean.setReasonOther(drugOther);
-        String drugResult = mTvDrugAfter.getText().toString().trim();
+        String drugAfter = mTvDrugAfter.getText().toString().trim();
-        if (!TextUtils.isEmpty(drugResult)) {
+        bean.setConsequence(drugAfter);
-            bean.setDrugResult(mSelDrugAfter);
-        }
         Gson gson = new Gson();
         String obj = gson.toJson(bean);
         RequestBody requestBody = RequestBody.create(MediaType.parse("application/json; charset=utf-8"), obj);
@@ -468,26 +515,13 @@ public class CensusDrugAddActivity extends BaseActivity {
             ToastUtils.showShort("请选择管控情况");
             return false;
         }
-        String controlName = mEtControlName.getText().toString().trim();
+
-        if (TextUtils.isEmpty(controlName)) {
-            ToastUtils.showShort("请输入管控人姓名");
-            return false;
-        }
         String controlPhone = mEtControlPhone.getText().toString().trim();
         if (TextUtils.isEmpty(controlPhone) || !RegexUtils.isPhone(controlPhone)) {
             ToastUtils.showShort("请输入正确的管控人联系电话");
             return false;
         }
-        String helpName = mEtHelpName.getText().toString().trim();
+
-        if (TextUtils.isEmpty(helpName)) {
-            ToastUtils.showShort("请输入帮扶人姓名");
-            return false;
-        }
-        String helpPhone = mEtHelpPhone.getText().toString().trim();
-        if (TextUtils.isEmpty(helpPhone) || !RegexUtils.isPhone(helpPhone)) {
-            ToastUtils.showShort("请输入正确的帮扶人联系电话");
-            return false;
-        }
 
         return true;
     }
@@ -529,107 +563,38 @@ public class CensusDrugAddActivity extends BaseActivity {
      * 根据身份证号码收搜人员详细信息
      */
     private void doSearchPerson() {
-        String searchIdCard = mEtSearchIdCard.getText().toString().trim();
-        if (TextUtils.isEmpty(searchIdCard) || !RegexUtils.isIDNumber(searchIdCard)) {
-            ToastUtils.showShort("请输入合法的身份证号码");
-            return;
-        } else {
-            hideSoftKeyboard();
-            ProgressDialog dialog = UIUtil.initDialog(mActivity, "查询中...");
-            dialog.show();
-            Observable<DrugDetailBean> detailBeanObservable = RetrofitManager.getInstance().create(LocationApiService.class).getDrugDetailByIdCard(searchIdCard, UserLgUtils.getToken());
-            Observable<SearchBaseInfoBean> infoBean = RetrofitManager.getInstance()
-                    .create(LocationApiService.class)
-                    .doSearchBaseInfoByIdCard(searchIdCard, UserLgUtils.getToken());
-            Observable.merge(detailBeanObservable, infoBean)
-                    .subscribeOn(Schedulers.io())
-                    .observeOn(AndroidSchedulers.mainThread())
-                    .subscribe(new Observer<Object>() {
-                        @Override
-                        public void onSubscribe(@NonNull Disposable d) {
 
-                        }
-
-                        @Override
-                        public void onNext(@NonNull Object o) {
-                            if (o instanceof SearchBaseInfoBean) {
-                                SearchBaseInfoBean infoBean1 = (SearchBaseInfoBean) o;
-                                if (!TextUtils.isEmpty(infoBean1.getIdCardNumber())) {
-                                    //设置基础信息
-                                    setBaseInfo(infoBean1);
-                                } else {
-                                    ToastUtils.showLong("未查询到该人员的基础信息,请完善基础信息");
-                                    mTvBaseName.setText("");
-                                    mTvBaseGender.setText("");
-                                    mTvBasePhone.setText("");
-                                    mTvBaseNative.setText("");
-                                    mTvBaseCurLoc.setText("");
-                                    mLlContent.setVisibility(View.GONE);
-                                }
-                            } else if (o instanceof DrugDetailBean) {
-                                DrugDetailBean bean = (DrugDetailBean) o;
-                                if (!TextUtils.isEmpty(bean.getAddictsId())) {
-                                    mTvBaseTitle.setText("吸毒人员信息编辑");
-                                } else {
-                                    mTvBaseTitle.setText("吸毒人员信息录入");
-                                }
-                                setDataToView(bean, 1);
-                            }
-                            dialog.dismiss();
-                        }
-
-                        @Override
-                        public void onError(@NonNull Throwable e) {
-                            dialog.dismiss();
-                            ExceptionHandler.handleException(e);
-                        }
-
-                        @Override
-                        public void onComplete() {
-
-                        }
-                    });
-        }
     }
 
     /**
      * 回填数据
      */
     private void setDataToView(DrugDetailBean bean, int type) {
-        mId = bean.getAddictsId();
+        mId = bean.getDrugId();
-        mTvFirstDate.setText(bean.getDiscoveryDate());//初次发现日期
+        mTvFirstDate.setText(bean.getStartTime());//初次发现日期
-        mTvControlCase.setText(bean.getControlInfoDictionaryName());//管控情况
+        mTvControlCase.setText(bean.getControl());//管控情况
-        mSelControlCase = bean.getControlInfo();
+        mEtControlPhone.setText(bean.getControlPhone());//管控人联系方式
-        mEtControlName.setText(bean.getControlUserName());//管控人姓名
+        mTvHelpStatus.setText(bean.getHelp());
-        mEtControlPhone.setText(bean.getControlUserPhone());//管控人联系方式
+        mEtHelpPhone.setText(bean.getHelpPhone());//帮扶人姓名
-        mEtHelpCase.setText(bean.getHelpInfo());//帮扶情况
+        mTvCrimeStatus.setText(bean.getCharge());
-        mEtHelpName.setText(bean.getHelpUserName());//帮扶人姓名
+        mTvDrugCase.setText(bean.getReason());//吸毒原因
-        mEtHelpPhone.setText(bean.getHelpUserPhone());//帮扶人联系方式
+        mEtDrugCase.setText(bean.getReasonOther());
-        mIsCrime = bean.getHasCrimeHis().equals("1");
+        mTvDrugAfter.setText(bean.getConsequence());//吸毒后果
-        mSwIsCrime.setChecked(mIsCrime);//有无犯罪历史
+
-        mEtCrimeCase.setText(bean.getCrimeInfo());//犯罪情况
-        mTvDrugCase.setText(bean.getDrugReasonDictionaryName());//吸毒原因
-        mSelDrugCase = bean.getDrugReason();
-        mTvDrugAfter.setText(bean.getDrugResultDictionaryName());//吸毒后果
-        mSelDrugAfter = bean.getDrugResult();
-        if (type == 0) {
-            mEtSearchIdCard.setText(bean.getIdCardNumber());
-            doSearchPerson();
-        }
         refreshView(STATE_LOAD_SUCCESS);
     }
 
     /**
      * 设置基础信息
      */
-    private void setBaseInfo(SearchBaseInfoBean o) {
+    private void setBaseInfo(BaseRegisterDetailBean o) {
         mBaseInfoBean = o;
         mLlContent.setVisibility(View.VISIBLE);
-        mTvBaseName.setText(o.getFullName());
+        mTvBaseName.setText(o.getName());
-        mTvBaseGender.setText(o.getGenderDictionaryName());
+        mTvBaseGender.setText(o.getSex());
-        mTvBasePhone.setText(o.getTelephone());
+        mTvBasePhone.setText(o.getPhone());
-        mTvBaseNative.setText(o.getNativePlaceAddr());
+        mTvBaseNative.setText(o.getOriginAddress());
-        mTvBaseCurLoc.setText(o.getAreaNames() + "/" + o.getCurrentResidenceAddr());
+        mTvBaseCurLoc.setText(o.getDomicileAreaName() + "/" + o.getDomicileAddress());
 
     }
 

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusDrugDetailActivity.java

@@ -1,5 +1,9 @@
 package com.sucstepsoft.realtimelocation.activitys.census.special;
 
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.Switch;
 import android.widget.TextView;
 
@@ -8,6 +12,7 @@ import com.sucstepsoft.cm_utils.core.widget.base.BaseActivity;
 import com.sucstepsoft.cm_utils.utils.UserLgUtils;
 import com.sucstepsoft.realtimelocation.R;
 import com.sucstepsoft.realtimelocation.beans.SearchBaseInfoBean;
+import com.sucstepsoft.realtimelocation.beans.person.BaseRegisterDetailBean;
 import com.sucstepsoft.realtimelocation.beans.person.DrugDetailBean;
 import com.sucstepsoft.realtimelocation.net.LocationApiService;
 import com.sucstepsoft.realtimelocation.utils.ExceptionHandler;
@@ -24,51 +29,50 @@ import io.reactivex.schedulers.Schedulers;
 
 //吸毒人员详情
 public class CensusDrugDetailActivity extends BaseActivity {
-    //基础信息
-    @BindView(R.id.tv_base_name)
-    TextView mTvBaseName;//姓名
-    @BindView(R.id.tv_base_former_name)
-    TextView mTvBaseFormerName;//曾用名
-    @BindView(R.id.tv_base_gender)
-    TextView mTvBaseGender;//性别
-    @BindView(R.id.tv_base_id_card)
-    TextView mTvBaseIdCard;//身份证
-    @BindView(R.id.tv_base_phone)
-    TextView mTvBasePhone;//联系电话
-    @BindView(R.id.tv_base_native)
-    TextView mTvBaseNative;//籍贯
-    @BindView(R.id.tv_base_nation)
-    TextView mTvBaseNation;//名族
-    @BindView(R.id.tv_base_cur_loc)
-    TextView mTvBaseCurLoc;//现住址
-    @BindView(R.id.tv_base_cur_address)
-    TextView mTvBaseCurAddress;//现住址详情
-    //详情
-    @BindView(R.id.tv_first_date)
-    TextView mTvFirstDate;//初次发现日期
-    @BindView(R.id.tv_control_case)
-    TextView mTvControlCase;//管控情况
-    @BindView(R.id.et_control_name)
-    TextView mEtControlName;//管控人姓名
-    @BindView(R.id.et_control_phone)
-    TextView mEtControlPhone;//管控人联系方式
-    @BindView(R.id.et_help_case)
-    TextView mEtHelpCase;//帮扶情况
-    @BindView(R.id.et_help_name)
-    TextView mEtHelpName;//帮扶人姓名
-    @BindView(R.id.et_help_phone)
-    TextView mEtHelpPhone;//帮扶人联系方式
-    @BindView(R.id.sw_is_crime)
-    Switch mSwIsCrime;//有无犯罪历史
-    @BindView(R.id.et_crime_case)
-    TextView mEtCrimeCase;//犯罪情况
-    @BindView(R.id.tv_drug_case)
-    TextView mTvDrugCase;//吸毒原因
-    @BindView(R.id.tv_drug_after)
-    TextView mTvDrugAfter;//吸毒后果
 
+
+    @BindView(R.id.et_search_id_card)
+    EditText mEtSearchIdCard;
+    @BindView(R.id.iv_clear)
+    ImageView mIvClear;
+    @BindView(R.id.btn_search)
+    Button mBtnSearch;
+    @BindView(R.id.ll_search_content)
+    LinearLayout mLlSearchContent;
+    @BindView(R.id.tv_base_name)
+    TextView mTvBaseName;
+    @BindView(R.id.tv_base_gender)
+    TextView mTvBaseGender;
+    @BindView(R.id.tv_base_phone)
+    TextView mTvBasePhone;
+    @BindView(R.id.tv_base_native)
+    TextView mTvBaseNative;
+    @BindView(R.id.tv_base_cur_loc)
+    TextView mTvBaseCurLoc;
+    @BindView(R.id.cv_base_info)
+    LinearLayout mCvBaseInfo;
+    @BindView(R.id.tv_first_date)
+    TextView mTvFirstDate;
+    @BindView(R.id.tv_control_case)
+    TextView mTvControlCase;
+    @BindView(R.id.tv_control_phone)
+    TextView mTvControlPhone;
+    @BindView(R.id.tv_help_status)
+    TextView mTvHelpStatus;
+    @BindView(R.id.tv_help_phone)
+    TextView mTvHelpPhone;
+    @BindView(R.id.tv_crime_status)
+    TextView mTvCrimeStatus;
+    @BindView(R.id.tv_drug_case)
+    TextView mTvDrugCase;
+    @BindView(R.id.tv_drug_other)
+    TextView mTvDrugOther;
+    @BindView(R.id.tv_drug_after)
+    TextView mTvDrugAfter;
+    @BindView(R.id.ll_content)
+    LinearLayout mLlContent;
     private Unbinder mBind;
-    private SearchBaseInfoBean mBaseInfo;
+    private BaseRegisterDetailBean mBaseInfo;
     private DrugDetailBean mDetailBean;
 
     @Override
@@ -93,9 +97,9 @@ public class CensusDrugDetailActivity extends BaseActivity {
      * @param idCard
      */
     private void getDetailData(String id, String idCard) {
-        Observable<SearchBaseInfoBean> baseInfo = RetrofitManager.getInstance().create(LocationApiService.class).doSearchBaseInfoByIdCard(idCard, UserLgUtils.getToken());
+        Observable<BaseRegisterDetailBean> baseRegisterDetail = RetrofitManager.getInstance().create(LocationApiService.class).getBaseRegisterDetail(idCard, UserLgUtils.getToken());
         Observable<DrugDetailBean> registerInfo = RetrofitManager.getInstance().create(LocationApiService.class).getDrugDetailById(id, UserLgUtils.getToken());
-        Observable.merge(baseInfo, registerInfo)
+        Observable.merge(baseRegisterDetail, registerInfo)
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(new Observer<Object>() {
@@ -106,8 +110,8 @@ public class CensusDrugDetailActivity extends BaseActivity {
 
                 @Override
                 public void onNext(@NonNull Object o) {
-                    if (o instanceof SearchBaseInfoBean) {
+                    if (o instanceof BaseRegisterDetailBean) {
-                        mBaseInfo = (SearchBaseInfoBean) o;
+                        mBaseInfo = (BaseRegisterDetailBean) o;
                         setBaseInfo();
                     } else if (o instanceof DrugDetailBean) {
                         mDetailBean = (DrugDetailBean) o;
@@ -134,31 +138,26 @@ public class CensusDrugDetailActivity extends BaseActivity {
      * 基础信息
      */
     private void setBaseInfo() {
-        mTvBaseName.setText(mBaseInfo.getFullName());
+        mTvBaseName.setText(mBaseInfo.getName());
-        mTvBaseFormerName.setText(mBaseInfo.getNameUsedBefore());
+        mTvBaseGender.setText(mBaseInfo.getSex());
-        mTvBaseGender.setText(mBaseInfo.getGenderDictionaryName());
+        mTvBasePhone.setText(mBaseInfo.getPhone());
-        mTvBaseIdCard.setText(mBaseInfo.getIdCardNumber());//身份证
+        mTvBaseNative.setText(mBaseInfo.getOriginAddress());
-        mTvBasePhone.setText(mBaseInfo.getTelephone());//联系电话
+        mTvBaseCurLoc.setText(mBaseInfo.getDomicileAreaName() + "/" + mBaseInfo.getDomicileAddress());
-        mTvBaseNative.setText(mBaseInfo.getNativePlaceAddr());//籍贯
-        mTvBaseNation.setText(mBaseInfo.getNationDictionaryName());//名族
-        mTvBaseCurLoc.setText(mBaseInfo.getAreaNames());//现住址
-        mTvBaseCurAddress.setText(mBaseInfo.getCurrentResidenceAddr());//现住址详情
     }
 
     /**
      * 详细信息
      */
     private void setDataToView() {
-        mTvFirstDate.setText(mDetailBean.getDiscoveryDate());//初次发现日期
+        mTvFirstDate.setText(mDetailBean.getStartTime());//初次发现日期
-        mTvControlCase.setText(mDetailBean.getControlInfoDictionaryName());//管控情况
+        mTvControlCase.setText(mDetailBean.getControl());//管控情况
-        mEtControlName.setText(mDetailBean.getControlUserName());//管控人姓名
+        mTvControlPhone.setText(mDetailBean.getControlPhone());//管控人联系方式
-        mEtControlPhone.setText(mDetailBean.getControlUserPhone());//管控人联系方式
+        mTvHelpStatus.setText(mDetailBean.getHelp());
-        mEtHelpCase.setText(mDetailBean.getHelpInfo());//帮扶情况
+        mTvHelpPhone.setText(mDetailBean.getHelpPhone());//帮扶人姓名
-        mEtHelpName.setText(mDetailBean.getHelpUserName());//帮扶人姓名
+        mTvCrimeStatus.setText(mDetailBean.getCharge());
-        mEtHelpPhone.setText(mDetailBean.getHelpUserPhone());//帮扶人联系方式
+        mTvDrugCase.setText(mDetailBean.getReason());//吸毒原因
-        mSwIsCrime.setChecked(mDetailBean.getHasCrimeHis().equals("1"));//有无犯罪历史
+        mTvDrugOther.setText(mDetailBean.getReasonOther());
-        mEtCrimeCase.setText(mDetailBean.getCrimeInfo());//犯罪情况
+        mTvDrugAfter.setText(mDetailBean.getConsequence());//吸毒后果
-        mTvDrugCase.setText(mDetailBean.getDrugReasonDictionaryName());//吸毒原因
+
-        mTvDrugAfter.setText(mDetailBean.getDrugResultDictionaryName());//吸毒后果
     }
 }

app/src/main/java/com/sucstepsoft/realtimelocation/activitys/census/special/CensusDrugListActivity.java

@@ -19,8 +19,10 @@ import com.sucstepsoft.cm_utils.utils.UIUtil;
 import com.sucstepsoft.cm_utils.utils.UserLgUtils;
 import com.sucstepsoft.realtimelocation.R;
 import com.sucstepsoft.realtimelocation.adapters.CensusPersonAdapter;
+import com.sucstepsoft.realtimelocation.adapters.DrugPersonAdapter;
 import com.sucstepsoft.realtimelocation.beans.SuccessBean;
 import com.sucstepsoft.realtimelocation.beans.person.CensusPersonBean;
+import com.sucstepsoft.realtimelocation.beans.person.DrugPersonBean;
 import com.sucstepsoft.realtimelocation.net.LocationApiService;
 import com.sucstepsoft.realtimelocation.utils.ExceptionHandler;
 
@@ -51,10 +53,12 @@ public class CensusDrugListActivity extends BaseActivity {
     private Unbinder mBind;
     private String mRows = "20";
     private int mCurPage = 1;
-    private CensusPersonAdapter mAdapter;
+    private DrugPersonAdapter mAdapter;
-    private List<CensusPersonBean.RowsBean> mDatas = new ArrayList<>();
+    private List<DrugPersonBean.RowsBean> mDatas = new ArrayList<>();
     private Disposable mDisposable;
     private String mKeywords = "";
+    private String mId;
+
     @Override
     protected int setLayoutId() {
         return R.layout.activity_census_drug_list;
@@ -66,9 +70,11 @@ public class CensusDrugListActivity extends BaseActivity {
         mTvBaseTitle.setText("吸毒人员");
         mTvPublish.setVisibility(View.VISIBLE);
         mTvPublish.setText("新增");
+        mId = getIntent().getStringExtra("idCard");
         mTvPublish.setOnClickListener(v -> {
             Intent intent = new Intent(mActivity, CensusDrugAddActivity.class);
             intent.putExtra("title", "吸毒人员信息录入");
+            intent.putExtra("idCard", mId);
             startActivity(intent);
         });
 
@@ -79,7 +85,7 @@ public class CensusDrugListActivity extends BaseActivity {
             refreshData();
         });
 
-        mAdapter = new CensusPersonAdapter(mActivity, mDatas);
+        mAdapter = new DrugPersonAdapter(mActivity, mDatas);
         LinearLayoutManager layoutManager = new LinearLayoutManager(mActivity);
         layoutManager.setOrientation(LinearLayoutManager.VERTICAL);
         mXlvItems.setLayoutManager(layoutManager);
@@ -100,18 +106,19 @@ public class CensusDrugListActivity extends BaseActivity {
                 getUpcomingList(mCurPage);
             }
         });
-        mAdapter.addOnEditListener(new CensusPersonAdapter.OnEditListener() {
+        mAdapter.addOnEditListener(new DrugPersonAdapter.OnEditListener() {
             @Override
-            public void onDel(CensusPersonBean.RowsBean bean, int pos) {
+            public void onDel(DrugPersonBean.RowsBean bean, int pos) {
                 doDelBean(bean, pos);
             }
 
             @Override
-            public void onEdit(CensusPersonBean.RowsBean bean, int pos) {
+            public void onEdit(DrugPersonBean.RowsBean bean, int pos) {
                 doEditBean(bean, pos);
             }
         });
     }
+
     /**
      * 搜索
      */
@@ -126,13 +133,14 @@ public class CensusDrugListActivity extends BaseActivity {
             ToastUtils.showShort("请输入要查询的内容");
         }
     }
+
     /**
      * 删除数据
      *
      * @param bean
      * @param pos
      */
-    private void doDelBean(CensusPersonBean.RowsBean bean, int pos) {
+    private void doDelBean(DrugPersonBean.RowsBean bean, int pos) {
         AlertDialog.Builder builder = new AlertDialog.Builder(mActivity);
         builder.setTitle("提示")
                 .setMessage("确定要删除该条信息吗?")
@@ -142,7 +150,7 @@ public class CensusDrugListActivity extends BaseActivity {
                     dialog1.show();
                     RetrofitManager.getInstance()
                             .create(LocationApiService.class)
-                            .doDelDrug(bean.getAddictsId(), UserLgUtils.getToken())
+                            .doDelDrug(bean.getDrugId(), UserLgUtils.getToken())
                             .subscribeOn(Schedulers.io())
                             .observeOn(AndroidSchedulers.mainThread())
                             .subscribe(new Observer<SuccessBean>() {
@@ -182,10 +190,11 @@ public class CensusDrugListActivity extends BaseActivity {
      * @param bean
      * @param pos
      */
-    private void doEditBean(CensusPersonBean.RowsBean bean, int pos) {
+    private void doEditBean(DrugPersonBean.RowsBean bean, int pos) {
         Intent intent = new Intent(mActivity, CensusDrugAddActivity.class);
         intent.putExtra("title", "吸毒人员信息编辑");
-        intent.putExtra("id", bean.getAddictsId());
+        intent.putExtra("id", bean.getDrugId());
+        intent.putExtra("idCard", bean.getPopulationInfoId());
         startActivity(intent);
     }
 
@@ -194,10 +203,10 @@ public class CensusDrugListActivity extends BaseActivity {
      *
      * @param bean
      */
-    private void showDetail(CensusPersonBean.RowsBean bean) {
+    private void showDetail(DrugPersonBean.RowsBean bean) {
         Intent intent = new Intent(mActivity, CensusDrugDetailActivity.class);
-        intent.putExtra("id", bean.getAddictsId());
+        intent.putExtra("id", bean.getDrugId());
-        intent.putExtra("idCard", bean.getIdCardNumber());
+        intent.putExtra("idCard", bean.getPopulationInfoId());
         startActivity(intent);
     }
 
@@ -218,17 +227,17 @@ public class CensusDrugListActivity extends BaseActivity {
         mCurPage = page;
         RetrofitManager.getInstance()
                 .create(LocationApiService.class)
-                .getDrugList(page + "",mKeywords ,UserLgUtils.getToken())
+                .getDrugList(mId, page + "", mKeywords, UserLgUtils.getToken())
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Observer<CensusPersonBean>() {
+                .subscribe(new Observer<DrugPersonBean>() {
                     @Override
                     public void onSubscribe(Disposable d) {
 
                     }
 
                     @Override
-                    public void onNext(CensusPersonBean leaveListBean) {
+                    public void onNext(DrugPersonBean leaveListBean) {
                         if (leaveListBean != null && leaveListBean.getRows() != null && leaveListBean.getRows().size() > 0) {
                             ++mCurPage;
                             if (page == 1) {

app/src/main/java/com/sucstepsoft/realtimelocation/adapters/DrugPersonAdapter.java

@@ -0,0 +1,56 @@
+package com.sucstepsoft.realtimelocation.adapters;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import com.sucstepsoft.cm_utils.core.widget.base.BaseRecyclerAdapter;
+import com.sucstepsoft.realtimelocation.R;
+import com.sucstepsoft.realtimelocation.adapters.holders.CensusPersonHolder;
+import com.sucstepsoft.realtimelocation.beans.person.CensusPersonBean;
+import com.sucstepsoft.realtimelocation.beans.person.DrugPersonBean;
+
+import java.util.List;
+
+/**
+ * 作者: adam
+ * 日期: 2020/11/17 - 1:22 PM
+ * 邮箱: itgaojian@163.com
+ * 描述: 人口adapter
+ */
+public class DrugPersonAdapter extends BaseRecyclerAdapter<DrugPersonBean.RowsBean, CensusPersonHolder> {
+    public DrugPersonAdapter(Context ctx, List<DrugPersonBean.RowsBean> list) {
+        super(ctx, list);
+    }
+
+    @Override
+    public CensusPersonHolder createHolder(ViewGroup parent, int viewType) {
+        View itemView = LayoutInflater.from(mContext).inflate(R.layout.item_person, parent, false);
+        return new CensusPersonHolder(itemView);
+    }
+
+    @Override
+    public void bindHolder(CensusPersonHolder censusPersonHolder, int i) {
+        DrugPersonBean.RowsBean bean = mData.get(i);
+        censusPersonHolder.mTvName.setText("管控情况:" + bean.getControl());
+        censusPersonHolder.mTvNative.setText("初次发现日期:" + bean.getStartTime());
+        censusPersonHolder.mTvPhone.setText("管控人联系方式:" + bean.getControlPhone());
+        censusPersonHolder.mTvLocation.setVisibility(View.GONE);
+        censusPersonHolder.mLine.setVisibility(View.GONE);
+        censusPersonHolder.mBtnEdit.setOnClickListener(v -> mEditListener.onEdit(bean, i));
+        censusPersonHolder.mBtnDel.setOnClickListener(v -> mEditListener.onDel(bean, i));
+    }
+
+    private OnEditListener mEditListener;
+
+    public void addOnEditListener(OnEditListener mListener) {
+        this.mEditListener = mListener;
+    }
+
+    public interface OnEditListener {
+        void onDel(DrugPersonBean.RowsBean bean, int pos);
+
+        void onEdit(DrugPersonBean.RowsBean bean, int pos);
+    }
+}

app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/DrugDetailBean.java

@@ -8,202 +8,148 @@ package com.sucstepsoft.realtimelocation.beans.person;
  */
 public class DrugDetailBean {
 
-    private String addictsId;
+    private String charge;
-    private String controlInfo;
+    private String consequence;
-    private String controlInfoDictionaryName;
+    private String control;
-    private String crimeInfo;
+    private String controlPhone;
-    private String discoveryDate;
+    private String creator;
-    private String helpUserPhone;
+    private String drugId;
-    private String idCardNumber;
+    private String gmtCreate;
-    private String controlUserName;
+    private String gmtModified;
-    private String hasCrimeHis;
+    private String help;
-    private String hasCrimeHisDictionaryName;
+    private String helpPhone;
-    private String drugResult;
+    private String isDelete;
-    private String drugResultDictionaryName;
+    private String modifier;
-    private String helpUserName;
+    private String populationInfoId;
-    private String controlUserPhone;
+    private String reason;
-    private String helpInfo;
+    private String reasonOther;
-    private String drugReason;
+    private String startTime;
-    private String drugReasonDictionaryName;
-    private String fullName;
-    private String gender;
-    private String telephone;
-    private String nativePlace;
-    private String currentResidence;
 
-    public String getAddictsId() {
+    public String getCharge() {
-        return addictsId;
+        return charge;
     }
 
-    public void setAddictsId(String addictsId) {
+    public void setCharge(String charge) {
-        this.addictsId = addictsId;
+        this.charge = charge;
     }
 
-    public String getControlInfo() {
+    public String getConsequence() {
-        return controlInfo;
+        return consequence;
     }
 
-    public void setControlInfo(String controlInfo) {
+    public void setConsequence(String consequence) {
-        this.controlInfo = controlInfo;
+        this.consequence = consequence;
     }
 
-    public String getControlInfoDictionaryName() {
+    public String getControl() {
-        return controlInfoDictionaryName;
+        return control;
     }
 
-    public void setControlInfoDictionaryName(String controlInfoDictionaryName) {
+    public void setControl(String control) {
-        this.controlInfoDictionaryName = controlInfoDictionaryName;
+        this.control = control;
     }
 
-    public String getCrimeInfo() {
+    public String getControlPhone() {
-        return crimeInfo;
+        return controlPhone;
     }
 
-    public void setCrimeInfo(String crimeInfo) {
+    public void setControlPhone(String controlPhone) {
-        this.crimeInfo = crimeInfo;
+        this.controlPhone = controlPhone;
     }
 
-    public String getDiscoveryDate() {
+    public String getCreator() {
-        return discoveryDate;
+        return creator;
     }
 
-    public void setDiscoveryDate(String discoveryDate) {
+    public void setCreator(String creator) {
-        this.discoveryDate = discoveryDate;
+        this.creator = creator;
     }
 
-    public String getHelpUserPhone() {
+    public String getDrugId() {
-        return helpUserPhone;
+        return drugId;
     }
 
-    public void setHelpUserPhone(String helpUserPhone) {
+    public void setDrugId(String drugId) {
-        this.helpUserPhone = helpUserPhone;
+        this.drugId = drugId;
     }
 
-    public String getIdCardNumber() {
+    public String getGmtCreate() {
-        return idCardNumber;
+        return gmtCreate;
     }
 
-    public void setIdCardNumber(String idCardNumber) {
+    public void setGmtCreate(String gmtCreate) {
-        this.idCardNumber = idCardNumber;
+        this.gmtCreate = gmtCreate;
     }
 
-    public String getControlUserName() {
+    public String getGmtModified() {
-        return controlUserName;
+        return gmtModified;
     }
 
-    public void setControlUserName(String controlUserName) {
+    public void setGmtModified(String gmtModified) {
-        this.controlUserName = controlUserName;
+        this.gmtModified = gmtModified;
     }
 
-    public String getHasCrimeHis() {
+    public String getHelp() {
-        return hasCrimeHis;
+        return help;
     }
 
-    public void setHasCrimeHis(String hasCrimeHis) {
+    public void setHelp(String help) {
-        this.hasCrimeHis = hasCrimeHis;
+        this.help = help;
     }
 
-    public String getHasCrimeHisDictionaryName() {
+    public String getHelpPhone() {
-        return hasCrimeHisDictionaryName;
+        return helpPhone;
     }
 
-    public void setHasCrimeHisDictionaryName(String hasCrimeHisDictionaryName) {
+    public void setHelpPhone(String helpPhone) {
-        this.hasCrimeHisDictionaryName = hasCrimeHisDictionaryName;
+        this.helpPhone = helpPhone;
     }
 
-    public String getDrugResult() {
+    public String getIsDelete() {
-        return drugResult;
+        return isDelete;
     }
 
-    public void setDrugResult(String drugResult) {
+    public void setIsDelete(String isDelete) {
-        this.drugResult = drugResult;
+        this.isDelete = isDelete;
     }
 
-    public String getDrugResultDictionaryName() {
+    public String getModifier() {
-        return drugResultDictionaryName;
+        return modifier;
     }
 
-    public void setDrugResultDictionaryName(String drugResultDictionaryName) {
+    public void setModifier(String modifier) {
-        this.drugResultDictionaryName = drugResultDictionaryName;
+        this.modifier = modifier;
     }
 
-    public String getHelpUserName() {
+    public String getPopulationInfoId() {
-        return helpUserName;
+        return populationInfoId;
     }
 
-    public void setHelpUserName(String helpUserName) {
+    public void setPopulationInfoId(String populationInfoId) {
-        this.helpUserName = helpUserName;
+        this.populationInfoId = populationInfoId;
     }
 
-    public String getControlUserPhone() {
+    public String getReason() {
-        return controlUserPhone;
+        return reason;
     }
 
-    public void setControlUserPhone(String controlUserPhone) {
+    public void setReason(String reason) {
-        this.controlUserPhone = controlUserPhone;
+        this.reason = reason;
     }
 
-    public String getHelpInfo() {
+    public String getReasonOther() {
-        return helpInfo;
+        return reasonOther;
     }
 
-    public void setHelpInfo(String helpInfo) {
+    public void setReasonOther(String reasonOther) {
-        this.helpInfo = helpInfo;
+        this.reasonOther = reasonOther;
     }
 
-    public String getDrugReason() {
+    public String getStartTime() {
-        return drugReason;
+        return startTime;
     }
 
-    public void setDrugReason(String drugReason) {
+    public void setStartTime(String startTime) {
-        this.drugReason = drugReason;
+        this.startTime = startTime;
-    }
-
-    public String getDrugReasonDictionaryName() {
-        return drugReasonDictionaryName;
-    }
-
-    public void setDrugReasonDictionaryName(String drugReasonDictionaryName) {
-        this.drugReasonDictionaryName = drugReasonDictionaryName;
-    }
-
-    public String getFullName() {
-        return fullName;
-    }
-
-    public void setFullName(String fullName) {
-        this.fullName = fullName;
-    }
-
-    public String getGender() {
-        return gender;
-    }
-
-    public void setGender(String gender) {
-        this.gender = gender;
-    }
-
-    public String getTelephone() {
-        return telephone;
-    }
-
-    public void setTelephone(String telephone) {
-        this.telephone = telephone;
-    }
-
-    public String getNativePlace() {
-        return nativePlace;
-    }
-
-    public void setNativePlace(String nativePlace) {
-        this.nativePlace = nativePlace;
-    }
-
-    public String getCurrentResidence() {
-        return currentResidence;
-    }
-
-    public void setCurrentResidence(String currentResidence) {
-        this.currentResidence = currentResidence;
     }
 }

app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/DrugPersonBean.java

@@ -0,0 +1,181 @@
+package com.sucstepsoft.realtimelocation.beans.person;
+
+import java.util.List;
+
+public class DrugPersonBean {
+
+    private int page;
+    private List<RowsBean> rows;
+    private int total;
+
+    public int getPage() {
+        return page;
+    }
+
+    public void setPage(int page) {
+        this.page = page;
+    }
+
+    public List<RowsBean> getRows() {
+        return rows;
+    }
+
+    public void setRows(List<RowsBean> rows) {
+        this.rows = rows;
+    }
+
+    public int getTotal() {
+        return total;
+    }
+
+    public void setTotal(int total) {
+        this.total = total;
+    }
+
+    public static class RowsBean {
+        private String charge;
+        private String consequence;
+        private String control;
+        private String controlPhone;
+        private String creator;
+        private String drugId;
+        private String gmtCreate;
+        private String gmtModified;
+        private String help;
+        private String helpPhone;
+        private String isDelete;
+        private String modifier;
+        private String populationInfoId;
+        private String reason;
+        private String reasonOther;
+        private String startTime;
+
+        public String getCharge() {
+            return charge;
+        }
+
+        public void setCharge(String charge) {
+            this.charge = charge;
+        }
+
+        public String getConsequence() {
+            return consequence;
+        }
+
+        public void setConsequence(String consequence) {
+            this.consequence = consequence;
+        }
+
+        public String getControl() {
+            return control;
+        }
+
+        public void setControl(String control) {
+            this.control = control;
+        }
+
+        public String getControlPhone() {
+            return controlPhone;
+        }
+
+        public void setControlPhone(String controlPhone) {
+            this.controlPhone = controlPhone;
+        }
+
+        public String getCreator() {
+            return creator;
+        }
+
+        public void setCreator(String creator) {
+            this.creator = creator;
+        }
+
+        public String getDrugId() {
+            return drugId;
+        }
+
+        public void setDrugId(String drugId) {
+            this.drugId = drugId;
+        }
+
+        public String getGmtCreate() {
+            return gmtCreate;
+        }
+
+        public void setGmtCreate(String gmtCreate) {
+            this.gmtCreate = gmtCreate;
+        }
+
+        public String getGmtModified() {
+            return gmtModified;
+        }
+
+        public void setGmtModified(String gmtModified) {
+            this.gmtModified = gmtModified;
+        }
+
+        public String getHelp() {
+            return help;
+        }
+
+        public void setHelp(String help) {
+            this.help = help;
+        }
+
+        public String getHelpPhone() {
+            return helpPhone;
+        }
+
+        public void setHelpPhone(String helpPhone) {
+            this.helpPhone = helpPhone;
+        }
+
+        public String getIsDelete() {
+            return isDelete;
+        }
+
+        public void setIsDelete(String isDelete) {
+            this.isDelete = isDelete;
+        }
+
+        public String getModifier() {
+            return modifier;
+        }
+
+        public void setModifier(String modifier) {
+            this.modifier = modifier;
+        }
+
+        public String getPopulationInfoId() {
+            return populationInfoId;
+        }
+
+        public void setPopulationInfoId(String populationInfoId) {
+            this.populationInfoId = populationInfoId;
+        }
+
+        public String getReason() {
+            return reason;
+        }
+
+        public void setReason(String reason) {
+            this.reason = reason;
+        }
+
+        public String getReasonOther() {
+            return reasonOther;
+        }
+
+        public void setReasonOther(String reasonOther) {
+            this.reasonOther = reasonOther;
+        }
+
+        public String getStartTime() {
+            return startTime;
+        }
+
+        public void setStartTime(String startTime) {
+            this.startTime = startTime;
+        }
+    }
+}

app/src/main/java/com/sucstepsoft/realtimelocation/beans/person/SaveDrugBean.java

@@ -8,157 +8,94 @@ package com.sucstepsoft.realtimelocation.beans.person;
  */
 public class SaveDrugBean {
 
-    /**
+    private String charge;
-     * controlInfo : string
+    private String consequence;
-     * controlUserName : string
+    private String control;
-     * controlUserPhone : string
+    private String controlPhone;
-     * crimeInfo : string
+    private String help;
-     * discoveryDate : string
+    private String helpPhone;
-     * drugReason : string
+    private String populationInfoId;
-     * drugResult : string
+    private String reason;
-     * fullName : string
+    private String reasonOther;
-     * gender : string
+    private String startTime;
-     * hasCrimeHis : string
-     * helpInfo : string
-     * helpUserName : string
-     * helpUserPhone : string
-     * idCardNumber : string
-     * telephone : string
-     */
 
-    private String controlInfo;
+    public String getCharge() {
-    private String controlUserName;
+        return charge;
-    private String controlUserPhone;
-    private String crimeInfo;
-    private String discoveryDate;
-    private String drugReason;
-    private String drugResult;
-    private String fullName;
-    private String gender;
-    private String hasCrimeHis;
-    private String helpInfo;
-    private String helpUserName;
-    private String helpUserPhone;
-    private String idCardNumber;
-    private String telephone;
-
-    public String getControlInfo() {
-        return controlInfo;
     }
 
-    public void setControlInfo(String controlInfo) {
+    public void setCharge(String charge) {
-        this.controlInfo = controlInfo;
+        this.charge = charge;
     }
 
-    public String getControlUserName() {
+    public String getConsequence() {
-        return controlUserName;
+        return consequence;
     }
 
-    public void setControlUserName(String controlUserName) {
+    public void setConsequence(String consequence) {
-        this.controlUserName = controlUserName;
+        this.consequence = consequence;
     }
 
-    public String getControlUserPhone() {
+    public String getControl() {
-        return controlUserPhone;
+        return control;
     }
 
-    public void setControlUserPhone(String controlUserPhone) {
+    public void setControl(String control) {
-        this.controlUserPhone = controlUserPhone;
+        this.control = control;
     }
 
-    public String getCrimeInfo() {
+    public String getControlPhone() {
-        return crimeInfo;
+        return controlPhone;
     }
 
-    public void setCrimeInfo(String crimeInfo) {
+    public void setControlPhone(String controlPhone) {
-        this.crimeInfo = crimeInfo;
+        this.controlPhone = controlPhone;
     }
 
-    public String getDiscoveryDate() {
+    public String getHelp() {
-        return discoveryDate;
+        return help;
     }
 
-    public void setDiscoveryDate(String discoveryDate) {
+    public void setHelp(String help) {
-        this.discoveryDate = discoveryDate;
+        this.help = help;
     }
 
-    public String getDrugReason() {
+    public String getHelpPhone() {
-        return drugReason;
+        return helpPhone;
     }
 
-    public void setDrugReason(String drugReason) {
+    public void setHelpPhone(String helpPhone) {
-        this.drugReason = drugReason;
+        this.helpPhone = helpPhone;
     }
 
-    public String getDrugResult() {
+    public String getPopulationInfoId() {
-        return drugResult;
+        return populationInfoId;
     }
 
-    public void setDrugResult(String drugResult) {
+    public void setPopulationInfoId(String populationInfoId) {
-        this.drugResult = drugResult;
+        this.populationInfoId = populationInfoId;
     }
 
-    public String getFullName() {
+    public String getReason() {
-        return fullName;
+        return reason;
     }
 
-    public void setFullName(String fullName) {
+    public void setReason(String reason) {
-        this.fullName = fullName;
+        this.reason = reason;
     }
 
-    public String getGender() {
+    public String getReasonOther() {
-        return gender;
+        return reasonOther;
     }
 
-    public void setGender(String gender) {
+    public void setReasonOther(String reasonOther) {
-        this.gender = gender;
+        this.reasonOther = reasonOther;
     }
 
-    public String getHasCrimeHis() {
+    public String getStartTime() {
-        return hasCrimeHis;
+        return startTime;
     }
 
-    public void setHasCrimeHis(String hasCrimeHis) {
+    public void setStartTime(String startTime) {
-        this.hasCrimeHis = hasCrimeHis;
+        this.startTime = startTime;
-    }
-
-    public String getHelpInfo() {
-        return helpInfo;
-    }
-
-    public void setHelpInfo(String helpInfo) {
-        this.helpInfo = helpInfo;
-    }
-
-    public String getHelpUserName() {
-        return helpUserName;
-    }
-
-    public void setHelpUserName(String helpUserName) {
-        this.helpUserName = helpUserName;
-    }
-
-    public String getHelpUserPhone() {
-        return helpUserPhone;
-    }
-
-    public void setHelpUserPhone(String helpUserPhone) {
-        this.helpUserPhone = helpUserPhone;
-    }
-
-    public String getIdCardNumber() {
-        return idCardNumber;
-    }
-
-    public void setIdCardNumber(String idCardNumber) {
-        this.idCardNumber = idCardNumber;
-    }
-
-    public String getTelephone() {
-        return telephone;
-    }
-
-    public void setTelephone(String telephone) {
-        this.telephone = telephone;
     }
 }

app/src/main/java/com/sucstepsoft/realtimelocation/net/LocationApiService.java

@@ -53,6 +53,7 @@ import com.sucstepsoft.realtimelocation.beans.person.CensusYoungDetailBean;
 import com.sucstepsoft.realtimelocation.beans.person.CommunityListBean;
 import com.sucstepsoft.realtimelocation.beans.person.CorrectDetailBean;
 import com.sucstepsoft.realtimelocation.beans.person.DrugDetailBean;
+import com.sucstepsoft.realtimelocation.beans.person.DrugPersonBean;
 import com.sucstepsoft.realtimelocation.beans.person.HouseDetailBean;
 import com.sucstepsoft.realtimelocation.beans.person.HouseListBean;
 import com.sucstepsoft.realtimelocation.beans.person.OutboundDetailBean;
@@ -1240,29 +1241,29 @@ public interface LocationApiService {
      * 保存吸毒人员
      */
     @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
-    @POST("app/addicts/saveaddicts")
+    @POST("app/drug/save")
     Observable<SuccessBean> doSaveDrug(@Body RequestBody body, @Header("token") String token);
 
     /**
      * 编辑吸毒人员
      */
     @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
-    @PUT("app/addicts/updateaddicts/{addictsId}")
+    @PUT("app/drug/updatedrug/{drugId}")
-    Observable<SuccessBean> doEditDrug(@Path("addictsId") String id, @Body RequestBody body, @Header("token") String token);
+    Observable<SuccessBean> doEditDrug(@Path("drugId") String id, @Body RequestBody body, @Header("token") String token);
 
     /**
      * 删除吸毒
      */
     @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
-    @DELETE("app/addicts/removeaddicts/{ids}")
+    @DELETE("app/drug/remove/{ids}")
     Observable<SuccessBean> doDelDrug(@Path("ids") String id, @Header("token") String token);
 
     /**
      * 根据ID获取详情
      */
     @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
-    @GET("app/addicts/getaddictsbyid/{addictsId}")
+    @GET("app/drug/get/{drugId}")
-    Observable<DrugDetailBean> getDrugDetailById(@Path("addictsId") String id, @Header("token") String token);
+    Observable<DrugDetailBean> getDrugDetailById(@Path("drugId") String id, @Header("token") String token);
 
     /**
      * 根据身份证号码获取详情
@@ -1275,8 +1276,8 @@ public interface LocationApiService {
      * 吸毒人员列表
      */
     @Headers({"base_url_name:person", "Content-Type: application/json", "Accept: application/json"})
-    @GET("app/addicts/listpageaddicts")
+    @GET("app/drug/listpagedrug")
-    Observable<CensusPersonBean> getDrugList(@Query("page") String page, @Query("keywords") String key, @Header("token") String token);
+    Observable<DrugPersonBean> getDrugList(@Query("populationInfoId")String id, @Query("page") String page, @Query("keywords") String key, @Header("token") String token);
 
     /*===========================================艾滋===========================================*/
 

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

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -13,7 +11,9 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <include layout="@layout/layout_search" />
+        <include
+            layout="@layout/layout_search"
+            android:visibility="gone" />
 
         <include layout="@layout/layout_base_info" />
 
@@ -23,263 +23,186 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
+            <TextView
+                style="@style/issue_report_title"
+                android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                android:drawablePadding="5dp"
+                android:padding="8dp"
+                android:text="吸毒信息"
+                android:textStyle="bold" />
 
-            <android.support.v7.widget.CardView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
+                android:background="@color/white"
-                app:cardCornerRadius="5dp"
+                android:orientation="vertical"
-                app:cardPreventCornerOverlap="true"
+                android:paddingLeft="20dp"
-                app:cardUseCompatPadding="false">
+                android:paddingRight="20dp">
+
+                <LinearLayout style="@style/item_white_bottom_border">
 
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
 
                     <TextView
-                        android:id="@+id/tv_issue_base_info"
+                        style="@style/item_title_wrap"
-                        style="@style/issue_report_title"
+                        android:text="初次发现日期" />
-                        android:padding="8dp"
-                        android:text="吸毒人员信息"
-                        android:textStyle="bold" />
 
-                    <LinearLayout style="@style/item_gray">
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical" />
 
-                        <ImageView style="@style/style_hint_star" />
+                    <TextView
+                        android:id="@+id/tv_first_date"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择初次发现日期" />
+                </LinearLayout>
 
-                        <TextView
+                <LinearLayout style="@style/item_white_bottom_border">
-                            style="@style/item_title"
-                            android:text="初次发现日期"
-                            android:textSize="12sp" />
-
-                        <View style="@style/vertical_line" />
-
-                        <TextView
-                            android:id="@+id/tv_first_date"
-                            style="@style/sel_text_arrow"
-                            android:hint="请选择初次发现日期" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView style="@style/style_hint_star" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:layout_gravity="center_vertical"
-                            android:text="管控情况" />
-
-                        <View style="@style/vertical_line" />
-
-                        <TextView
-                            android:id="@+id/tv_control_case"
-                            style="@style/sel_text_arrow"
-                            android:hint="请选择管控情况" />
-
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView
-                            style="@style/style_hint_star"
-                            android:visibility="visible" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:layout_gravity="center_vertical"
-                            android:text="管控人姓名" />
-
-                        <View style="@style/vertical_line" />
-
-                        <EditText
-                            android:id="@+id/et_control_name"
-                            style="@style/item_content"
-                            android:layout_gravity="center_vertical"
-                            android:hint="请输入管控人姓名"
-                            android:inputType="text" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView
-                            style="@style/style_hint_star"
-                            android:visibility="visible" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:layout_gravity="center_vertical"
-                            android:text="管  控  人\n联系方式" />
-
-                        <View style="@style/vertical_line" />
-
-                        <EditText
-                            android:id="@+id/et_control_phone"
-                            style="@style/item_content"
-                            android:layout_gravity="center_vertical"
-                            android:hint="请输入管控人联系方式"
-                            android:inputType="number" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView
-                            style="@style/style_hint_star"
-                            android:visibility="invisible" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:layout_gravity="center_vertical"
-                            android:text="帮扶情况" />
-
-                        <View style="@style/vertical_line" />
-
-                        <EditText
-                            android:id="@+id/et_help_case"
-                            style="@style/item_content"
-                            android:layout_gravity="center_vertical"
-                            android:hint="请输入帮扶情况"
-                            android:inputType="textMultiLine" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView style="@style/style_hint_star" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:layout_gravity="center_vertical"
-                            android:text="帮扶人姓名" />
-
-                        <View style="@style/vertical_line" />
-
-                        <EditText
-                            android:id="@+id/et_help_name"
-                            style="@style/item_content"
-                            android:layout_gravity="center_vertical"
-                            android:hint="请输入帮扶人姓名"
-                            android:inputType="textMultiLine" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView style="@style/style_hint_star" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:text="帮  扶  人\n联系方式" />
-
-                        <View style="@style/vertical_line" />
 
 
-                        <EditText
+                    <TextView
-                            android:id="@+id/et_help_phone"
+                        style="@style/item_title_wrap"
-                            style="@style/item_content"
+                        android:text="管控情况" />
-                            android:layout_gravity="center_vertical"
-                            android:hint="请输入帮扶人联系方式"
-                            android:inputType="number" />
-                    </LinearLayout>
 
-                    <LinearLayout style="@style/item_gray">
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical" />
 
-                        <ImageView
+                    <TextView
-                            style="@style/style_hint_star"
+                        android:id="@+id/tv_control_case"
-                            android:visibility="invisible" />
+                        style="@style/sel_text_arrow"
-
+                        android:hint="请选择管控情况" />
-                        <TextView
+                </LinearLayout>
-                            style="@style/item_title"
-                            android:layout_gravity="center_vertical"
-                            android:text="有无犯罪史" />
-
-                        <View style="@style/vertical_line" />
 
 
-                        <Switch
+                <LinearLayout style="@style/item_white_bottom_border">
-                            android:id="@+id/sw_is_crime"
-                            style="@style/item_switch_have"
-                            android:layout_gravity="center_vertical" />
-                    </LinearLayout>
 
-                    <LinearLayout style="@style/item_gray">
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="管控人联系方式" />
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical" />
+                    <EditText
+                        android:id="@+id/et_control_phone"
+                        style="@style/item_content_match"
+                        android:hint="请输入管控人联系方式" />
 
-                        <ImageView
-                            style="@style/style_hint_star"
-                            android:visibility="invisible" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:layout_gravity="center_vertical"
-                            android:text="犯罪情况" />
-
-                        <View style="@style/vertical_line" />
-
-                        <EditText
-                            android:id="@+id/et_crime_case"
-                            style="@style/item_content"
-                            android:layout_gravity="center_vertical"
-                            android:hint="请输入犯罪情况"
-                            android:inputType="textMultiLine" />
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView
-                            style="@style/style_hint_star"
-                            android:visibility="invisible" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:layout_gravity="center_vertical"
-                            android:text="吸毒原因" />
-
-                        <View style="@style/vertical_line" />
-
-
-                        <TextView
-                            android:id="@+id/tv_drug_case"
-                            style="@style/sel_text_arrow"
-                            android:layout_gravity="center_vertical"
-                            android:hint="请选择吸毒原因" />
-
-                    </LinearLayout>
-
-                    <LinearLayout style="@style/item_gray">
-
-                        <ImageView
-                            style="@style/style_hint_star"
-                            android:visibility="invisible" />
-
-                        <TextView
-                            style="@style/item_title"
-                            android:layout_gravity="center_vertical"
-                            android:text="吸毒后果" />
-
-                        <View style="@style/vertical_line" />
-
-
-                        <TextView
-                            android:id="@+id/tv_drug_after"
-                            style="@style/sel_text_arrow"
-                            android:layout_gravity="center_vertical"
-                            android:hint="请选择吸毒后果" />
-
-                    </LinearLayout>
-
-
-                    <Button
-                        android:id="@+id/btn_confirm"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_margin="15dp"
-                        android:background="@drawable/sel_btn_submit"
-                        android:minHeight="0dp"
-                        android:padding="10dp"
-                        android:text="保&#160;&#160;&#160;&#160;存"
-                        android:textColor="@color/white"
-                        android:textSize="17sp" />
 
                 </LinearLayout>
-            </android.support.v7.widget.CardView>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="帮扶情况" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/tv_help_status"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择帮扶情况" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="帮扶人联系方式" />
+
+                    <EditText
+                        android:id="@+id/et_help_phone"
+                        style="@style/item_content_match"
+                        android:hint="请输入帮扶人联系方式"
+                        android:inputType="number" />
+
+
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="犯罪情况" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/tv_crime_status"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择犯罪情况" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="吸毒原因" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/tv_drug_case"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择吸毒原因" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="吸毒原因(其他)" />
+
+                    <EditText
+                        android:id="@+id/et_drug_case"
+                        style="@style/item_content_match"
+                        android:hint="请输入吸毒原因(其他)" />
+
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="吸毒后果" />
+
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical"
+                        android:visibility="gone" />
+
+                    <TextView
+                        android:id="@+id/tv_drug_after"
+                        style="@style/sel_text_arrow"
+                        android:hint="请选择吸毒后果" />
+                </LinearLayout>
+
+                <Button
+                    android:id="@+id/btn_confirm"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="15dp"
+                    android:background="@drawable/sel_btn_submit"
+                    android:minHeight="0dp"
+                    android:padding="10dp"
+                    android:text="保&#160;&#160;&#160;&#160;存"
+                    android:textColor="@color/white"
+                    android:textSize="17sp" />
+
+            </LinearLayout>
         </LinearLayout>
 
     </LinearLayout>

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

@@ -1,220 +1,174 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v4.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:overScrollMode="never"
+    android:scrollbars="none">
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:orientation="vertical">
 
-        <include layout="@layout/layout_base_info_detail" />
+        <include
+            layout="@layout/layout_search"
+            android:visibility="gone" />
 
-        <android.support.v7.widget.CardView
+        <include layout="@layout/layout_base_info" />
+
+        <LinearLayout
+            android:id="@+id/ll_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
+            android:orientation="vertical">
-            app:cardCornerRadius="5dp"
+
-            app:cardPreventCornerOverlap="true"
+            <TextView
-            app:cardUseCompatPadding="false">
+                style="@style/issue_report_title"
+                android:drawableLeft="@drawable/ic_item_title_icon_rec"
+                android:drawablePadding="5dp"
+                android:padding="8dp"
+                android:text="吸毒信息"
+                android:textStyle="bold" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:background="@color/white"
+                android:orientation="vertical"
+                android:paddingLeft="20dp"
+                android:paddingRight="20dp">
 
-                <TextView
+                <LinearLayout style="@style/item_white_bottom_border">
-                    android:id="@+id/tv_issue_base_info"
-                    style="@style/issue_report_title"
-                    android:padding="8dp"
-                    android:text="吸毒人员信息"
-                    android:textStyle="bold" />
-
-                <LinearLayout style="@style/item_gray">
 
 
                     <TextView
-                        style="@style/item_title"
+                        style="@style/item_title_wrap"
-                        android:text="初次发现日期"
+                        android:text="初次发现日期" />
-                        android:textSize="12sp" />
 
-                    <View style="@style/vertical_line" />
 
                     <TextView
                         android:id="@+id/tv_first_date"
-                        style="@style/sel_text_show" />
+                        style="@style/sel_text_arrow_text" />
                 </LinearLayout>
 
-                <LinearLayout style="@style/item_gray">
+                <LinearLayout style="@style/item_white_bottom_border">
 
 
                     <TextView
-                        style="@style/item_title"
+                        style="@style/item_title_wrap"
-                        android:layout_gravity="center_vertical"
                         android:text="管控情况" />
 
-                    <View style="@style/vertical_line" />
 
                     <TextView
                         android:id="@+id/tv_control_case"
-                        style="@style/sel_text_show" />
+                        style="@style/sel_text_arrow_text" />
+                </LinearLayout>
+
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="管控人联系方式" />
+
+                    <TextView
+                        android:id="@+id/tv_control_phone"
+                        style="@style/sel_text_arrow_text" />
+
 
                 </LinearLayout>
 
-                <LinearLayout style="@style/item_gray">
+                <LinearLayout style="@style/item_white_bottom_border">
 
 
                     <TextView
-                        style="@style/item_title"
+                        style="@style/item_title_wrap"
-                        android:layout_gravity="center_vertical"
-                        android:text="管控人姓名" />
-
-                    <View style="@style/vertical_line" />
-
-                    <TextView
-                        android:id="@+id/et_control_name"
-                        style="@style/sel_text_show"
-                        android:layout_gravity="center_vertical" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_gray">
-
-
-                    <TextView
-                        style="@style/item_title"
-                        android:layout_gravity="center_vertical"
-                        android:text="管  控  人\n联系方式" />
-
-                    <View style="@style/vertical_line" />
-
-                    <TextView
-                        android:id="@+id/et_control_phone"
-                        style="@style/sel_text_show"
-                        android:layout_gravity="center_vertical" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_gray">
-
-
-                    <TextView
-                        style="@style/item_title"
-                        android:layout_gravity="center_vertical"
                         android:text="帮扶情况" />
 
-                    <View style="@style/vertical_line" />
 
                     <TextView
-                        android:id="@+id/et_help_case"
+                        android:id="@+id/tv_help_status"
-                        style="@style/sel_text_show"
+                        style="@style/sel_text_arrow_text" />
-                        android:layout_gravity="center_vertical" />
                 </LinearLayout>
 
-                <LinearLayout style="@style/item_gray">
+                <LinearLayout style="@style/item_white_bottom_border">
-
 
                     <TextView
-                        style="@style/item_title"
+                        style="@style/item_title_wrap"
-                        android:layout_gravity="center_vertical"
+                        android:text="帮扶人联系方式" />
-                        android:text="帮扶人姓名" />
-
-                    <View style="@style/vertical_line" />
 
                     <TextView
-                        android:id="@+id/et_help_name"
+                        android:id="@+id/tv_help_phone"
-                        style="@style/sel_text_show"
+                        style="@style/sel_text_arrow_text" />
-                        android:layout_gravity="center_vertical" />
                 </LinearLayout>
 
-                <LinearLayout style="@style/item_gray">
+                <LinearLayout style="@style/item_white_bottom_border">
 
 
                     <TextView
-                        style="@style/item_title"
+                        style="@style/item_title_wrap"
-                        android:text="帮  扶  人\n联系方式" />
-
-                    <View style="@style/vertical_line" />
-
-
-                    <TextView
-                        android:id="@+id/et_help_phone"
-                        style="@style/sel_text_show"
-                        android:layout_gravity="center_vertical" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_gray">
-
-
-                    <TextView
-                        style="@style/item_title"
-                        android:layout_gravity="center_vertical"
-                        android:text="有无犯罪史" />
-
-                    <View style="@style/vertical_line" />
-
-
-                    <Switch
-                        android:id="@+id/sw_is_crime"
-                        style="@style/item_switch_have"
-                        android:layout_gravity="center_vertical"
-                        android:enabled="false" />
-                </LinearLayout>
-
-                <LinearLayout style="@style/item_gray">
-
-
-                    <TextView
-                        style="@style/item_title"
-                        android:layout_gravity="center_vertical"
                         android:text="犯罪情况" />
 
-                    <View style="@style/vertical_line" />
+                    <ImageView
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical"
+                        android:visibility="gone" />
 
                     <TextView
-                        android:id="@+id/et_crime_case"
+                        android:id="@+id/tv_crime_status"
-                        style="@style/sel_text_show"
+                        style="@style/sel_text_arrow_text" />
-                        android:layout_gravity="center_vertical" />
                 </LinearLayout>
 
-                <LinearLayout style="@style/item_gray">
+                <LinearLayout style="@style/item_white_bottom_border">
 
 
                     <TextView
-                        style="@style/item_title"
+                        style="@style/item_title_wrap"
-                        android:layout_gravity="center_vertical"
                         android:text="吸毒原因" />
 
-                    <View style="@style/vertical_line" />
+                    <ImageView
-
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical"
+                        android:visibility="gone" />
 
                     <TextView
                         android:id="@+id/tv_drug_case"
-                        style="@style/sel_text_show"
+                        style="@style/sel_text_arrow_text" />
-                        android:layout_gravity="center_vertical" />
+                </LinearLayout>
+
+                <LinearLayout style="@style/item_white_bottom_border">
+
+                    <TextView
+                        style="@style/item_title_wrap"
+                        android:text="吸毒原因(其他)" />
+
+                    <TextView
+                        android:id="@+id/tv_drug_other"
+                        style="@style/sel_text_arrow_text" />
 
                 </LinearLayout>
 
-                <LinearLayout style="@style/item_gray">
+                <LinearLayout style="@style/item_white_bottom_border">
 
 
                     <TextView
-                        style="@style/item_title"
+                        style="@style/item_title_wrap"
-                        android:layout_gravity="center_vertical"
                         android:text="吸毒后果" />
 
-                    <View style="@style/vertical_line" />
+                    <ImageView
-
+                        style="@style/style_hint_star"
+                        android:layout_gravity="center_vertical"
+                        android:visibility="gone" />
 
                     <TextView
                         android:id="@+id/tv_drug_after"
-                        style="@style/sel_text_show" />
+                        style="@style/sel_text_arrow_text" />
-
                 </LinearLayout>
 
 
             </LinearLayout>
-        </android.support.v7.widget.CardView>
+        </LinearLayout>
 
     </LinearLayout>
 </android.support.v4.widget.NestedScrollView>

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

@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <include layout="@layout/item_search" />
+    <include layout="@layout/item_search" android:visibility="gone"/>
 
     <com.jcodecraeer.xrecyclerview.XRecyclerView
         android:id="@+id/xlv_content"

cm_utils/src/main/java/com/sucstepsoft/cm_utils/constant/PathConfig.java

@@ -92,6 +92,8 @@ public class PathConfig {
     public static final String DIC_CONTROL = "1d2accca-8475-4ed5-992e-5d55df05eedf";//管控情况
     public static final String DIC_DRUG_CAUSE = "85d73246-d5b8-4e25-b2a2-97f99467a88a";//吸毒原因
     public static final String DIC_DRUG_AFTER = "571c17af-27aa-40ee-84ad-837c67ba7d78";//吸毒后果
+    public static final String DIC_DRUG_HELP = "f8a5c55a-80b7-4eab-acaf-556af87e46c9";//帮扶情况
+    public static final String DIC_DRUG_CRIME = "9e539a36-0193-4c36-be6d-68f528ecdf38";//犯罪情况
     public static final String DIC_INFECT_WAY = "36c7c7d0-da63-4b3d-add8-f00e5217e344";//感染途径
     public static final String DIC_ADMISSION = "e9c8f2fa-03ca-4b62-aca5-4c136cd3fd12";//收治情况
     public static final String DIC_ATTENTION = "75d635fb-9828-45c4-83bb-b6888923086e";//关注类型