Merge branch 'dev' of LiTaohong/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/patient/service/BasePatientService.java

@@ -171,7 +171,7 @@ public class BasePatientService<T, R extends CrudRepository> extends BaseJpaServ
    public BasePatientDO findByIdAndDel(String patient) throws Exception{
        BasePatientDO basePatientDO = basePatientDao.findById(patient);
        if(basePatientDO==null){
            throw new Exception("not patient");
            throw new Exception("用户不存在");
        }
        return basePatientDO;
    }

svr/svr-patient/pom.xml

@@ -196,9 +196,14 @@
            <version>2.0.0</version>
            <scope>compile</scope>
        </dependency>
        <!--<dependency>-->
            <!--<groupId>junit</groupId>-->
            <!--<artifactId>junit</artifactId>-->
        <!--</dependency>-->
        <dependency>
            <groupId>junit</groupId>
            <artifactId>junit</artifactId>
            <groupId>org.junit.platform</groupId>
            <artifactId>junit-platform-commons</artifactId>
            <version>1.3.2</version>
        </dependency>
    </dependencies>

svr/svr-patient/sql/sql

@@ -6,10 +6,10 @@ create table `patient_medicare_card`
  `id` int(11) NOT NULL AUTO_INCREMENT  COMMENT '表id，自增长',
  `code` varchar(50) not null COMMENT '卡标识',
  `parent_type` varchar(1) DEFAULT NULL COMMENT '卡的大类（A-医疗卡，B-优惠券，C-银行卡，unknow-其他）',
  `type` varchar(1) DEFAULT NULL COMMENT '卡的小类：医疗卡包含 A_01 医保卡，A_02 电子社保卡 A_03 电子就诊卡等等',
  `type` varchar(10) DEFAULT NULL COMMENT '卡的小类：医疗卡包含 A_01 医保卡，A_02 电子社保卡 A_03 电子就诊卡等等',
  `patient_code` varchar(50) not null COMMENT '居民标识',
  `password` varchar(50)  null COMMENT '绑定密码',
  `wx_openid` varchar(50)  null COMMENT '微信openid，有些卡会绑定微信',
  `city_code` varchar(50)  null COMMENT '医社保卡缴交的城市',
  `org_code` varchar(50)  null COMMENT '机构code，就诊卡跟医院关联',
  `remark` varchar(50)  null COMMENT '备注',
  `del` varchar(50) not null COMMENT '状态，0-解除绑定，1-绑定中',
@@ -40,7 +40,7 @@ create table `feedback`
  `id` int(11) NOT NULL AUTO_INCREMENT  COMMENT '表id，自增长',
  `type` varchar(1) DEFAULT NULL COMMENT '问题类型（功能异常-无法使用功能，功能优化-不好用、界面难看，新功能建议-你希望有什么功能，其他-其他任何问题）',
  `feedback_content` varchar(100) not null COMMENT '反馈内容，问题和建议',
  `img` varchar(1000) not null COMMENT '图片，存图片地址，逗号分割',
  `img` varchar(1000) DEFAULT null COMMENT '图片，存图片地址，逗号分割',
  `mobile` varchar(11) not null COMMENT '联系手机号码',
  primary key (id)
)
@@ -56,7 +56,7 @@ create table `account_appeal`
  `name` varchar(10) not null COMMENT '申诉人姓名',
  `idcard` varchar(18) not null COMMENT '申诉人身份证号码',
  `mobile` varchar(11) not null COMMENT '申诉人手机号码',
  `img` varchar(1000) not null COMMENT '身份证正反面照片，存地址，逗号分割',
  `img` varchar(1000) DEFAULT null COMMENT '身份证正反面照片，存地址，逗号分割',
  primary key (id)
)
  ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='账号申诉';
@@ -104,8 +104,9 @@ alter table base_patient drop column ssc;
alter table base_patient drop column disease;
alter table base_patient drop column disease_condition;
alter table base_patient drop column principal_code;
alter table base_patient add column principal_code varchar(50) DEFAULT NULL;
alter table base_patient drop column sicard_status;
alter table base_patient drop column sicard_time;
alter table base_patient drop column is_wxtag;
alter table base_patient drop column wxtagid;
alter table base_patient drop column medicare_number;
alter table base_patient drop column medicare_number;

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/personal_Info/PatientService.java

@@ -268,6 +268,7 @@ public class PatientService extends BasePatientService<BasePatientDO, BasePatien
        patientBrief.setLiveCityCode(patientDetail.getLiveCityCode());
        patientBrief.setLiveCityName(patientDetail.getLiveCityName());
        patientBrief.setLiveTownCode(patientDetail.getLiveTownCode());
        patientBrief.setLiveTownName(patientDetail.getLiveTownName());
        patientBrief.setLiveStreetCode(patientDetail.getLiveStreetCode());
        patientBrief.setLiveStreetName(patientDetail.getLiveStreetName());
        patientBrief.setAddress(patientDetail.getAddress());