Merge branch 'dev-fixbug-0919' into 'release'

Dev fixbug 0919

See merge request !121

server/pom.xml

@@ -307,6 +307,23 @@
             <artifactId>pica-cloud-doctor-common</artifactId>
             <version>2.2.17-SNAPSHOT</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.pica.cloud.base.hospital</groupId>
+            <artifactId>pica-cloud-hospital-client</artifactId>
+            <version>2.2.1-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>pica-cloud-utils</artifactId>
+                    <groupId>com.pica.cloud.foundation</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>com.pica.cloud.base.hospital</groupId>
+            <artifactId>pica-cloud-hospital-common</artifactId>
+            <version>2.2.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <dependencyManagement>

server/src/main/java/com/pica/cloud/account/account/server/entity/Account.java

@@ -80,6 +80,87 @@ public class Account {
 
     private Date birthday;
 
+    @ApiModelProperty("省id")
+    private Long province;
+    @ApiModelProperty("省名称")
+    private String provinceName;
+    @ApiModelProperty("市id")
+    private Long city;
+    @ApiModelProperty("市名称")
+    private String cityName;
+    @ApiModelProperty("县id")
+    private Long county;
+    @ApiModelProperty("县名称")
+    private String countyName;
+    @ApiModelProperty("乡镇id")
+    private Long town;
+    @ApiModelProperty("乡镇名称")
+    private String townName;
+
+    public Long getProvince() {
+        return province;
+    }
+
+    public void setProvince(Long province) {
+        this.province = province;
+    }
+
+    public String getProvinceName() {
+        return provinceName;
+    }
+
+    public void setProvinceName(String provinceName) {
+        this.provinceName = provinceName;
+    }
+
+    public Long getCity() {
+        return city;
+    }
+
+    public void setCity(Long city) {
+        this.city = city;
+    }
+
+    public String getCityName() {
+        return cityName;
+    }
+
+    public void setCityName(String cityName) {
+        this.cityName = cityName;
+    }
+
+    public Long getCounty() {
+        return county;
+    }
+
+    public void setCounty(Long county) {
+        this.county = county;
+    }
+
+    public String getCountyName() {
+        return countyName;
+    }
+
+    public void setCountyName(String countyName) {
+        this.countyName = countyName;
+    }
+
+    public Long getTown() {
+        return town;
+    }
+
+    public void setTown(Long town) {
+        this.town = town;
+    }
+
+    public String getTownName() {
+        return townName;
+    }
+
+    public void setTownName(String townName) {
+        this.townName = townName;
+    }
+
     public String getNativePlace() {
         return nativePlace;
     }

server/src/main/java/com/pica/cloud/account/account/server/service/impl/HospitalSaasUserServiceImpl.java

@@ -13,6 +13,8 @@ import com.pica.cloud.account.account.server.req.HospitalSaasUserReq;
 import com.pica.cloud.account.account.server.resp.*;
 import com.pica.cloud.account.account.server.service.*;
 import com.pica.cloud.account.account.server.util.AESUtil;
+import com.pica.cloud.base.hospital.hospital.client.HospitalFeignService;
+import com.pica.cloud.base.hospital.hospital.common.vo.HospitalDetailVo;
 import com.pica.cloud.foundation.encryption.common.constants.EncryptConstants;
 import com.pica.cloud.foundation.encryption.util.EncryptUtils;
 import com.pica.cloud.foundation.entity.PicaException;
@@ -21,6 +23,7 @@ import com.pica.cloud.foundation.entity.PicaResultCode;
 import com.pica.cloud.foundation.redis.ICacheClient;
 import com.pica.cloud.foundation.utils.entity.PicaUser;
 import com.pica.cloud.foundation.utils.utils.MD5Util;
+import com.pica.cloud.foundation.utils.utils.StringUtil;
 import com.pica.cloud.tag.transport.client.ITransportDoctorClient;
 import com.pica.cloud.tag.transport.contract.req.StickerProfileDto;
 import com.pica.cloud.trade.store.client.StoreCertifyServiceClient;
@@ -80,6 +83,8 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
 
     @Autowired
     private DoctorService doctorService;
+    @Autowired
+    private HospitalFeignService hospitalFeignService;
 
     @Override
     @Transactional
@@ -442,8 +447,26 @@ public class HospitalSaasUserServiceImpl implements HospitalSaasUserService {
         account.setName(hospitalSaasUserReq.getName());
         account.setComment(hospitalSaasUserReq.getComment());
         account.setDeleteFlag(1);
-        account.setHospitalId(hospitalSaasUserReq.getHospitalId());
-        account.setHospital(hospitalSaasUserReq.getHospitalName());
+
+        /** 根据机构ID查询地区信息  */
+        HospitalDetailVo hospitalDetailVo = hospitalFeignService.queryByEncryptHospitalId(EncryptUtils.encryptContent(hospitalSaasUserReq.getHospitalId().toString(),EncryptConstants.ENCRYPT_TYPE_DOCTOR_ID)).getData();
+        if (StringUtil.isNotNull(hospitalDetailVo)) {
+            account.setHospitalId(hospitalSaasUserReq.getHospitalId());
+            if (StringUtil.isNull(hospitalSaasUserReq.getHospitalName())) {
+                account.setHospital(hospitalDetailVo.getName());
+            } else {
+                account.setHospital(hospitalSaasUserReq.getHospitalName());
+            }
+
+            account.setProvince(hospitalDetailVo.getProvinceId());
+            account.setProvinceName(hospitalDetailVo.getProvinceName());
+            account.setCity(hospitalDetailVo.getCityId());
+            account.setCityName(hospitalDetailVo.getCityName());
+            account.setCounty(hospitalDetailVo.getCountyId());
+            account.setCountyName(hospitalDetailVo.getCountyName());
+            account.setTown(hospitalDetailVo.getTownId());
+            account.setTownName(hospitalDetailVo.getTownName());
+        }
         account.setCreatId(0L);
         account.setModifyId(0L);
         account.setCreatTime(currentTime);

server/src/main/resources/mybatis/AccountMapper.xml

@@ -138,6 +138,30 @@
             <if test="hospital != null">
                 hospital,
             </if>
+            <if test="province != null">
+                province,
+            </if>
+            <if test="provinceName != null">
+                province_name,
+            </if>
+            <if test="city != null">
+                city,
+            </if>
+            <if test="cityName != null">
+                city_name,
+            </if>
+            <if test="county != null">
+                county,
+            </if>
+            <if test="countyName != null">
+                county_name,
+            </if>
+            <if test="town != null">
+                town,
+            </if>
+            <if test="townName != null">
+                town_name,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="sex != null">
@@ -224,6 +248,30 @@
             <if test="hospital != null">
                 #{hospital,jdbcType=VARCHAR},
             </if>
+            <if test="province != null">
+                #{province},
+            </if>
+            <if test="provinceName != null">
+                #{provinceName},
+            </if>
+            <if test="city != null">
+                #{city},
+            </if>
+            <if test="cityName != null">
+                #{cityName},
+            </if>
+            <if test="county != null">
+                #{county},
+            </if>
+            <if test="countyName != null">
+                #{countyName},
+            </if>
+            <if test="town != null">
+                #{town},
+            </if>
+            <if test="townName != null">
+                #{townName},
+            </if>
         </trim>
     </insert>
     <update id="updateByIdSelective" parameterType="com.pica.cloud.account.account.server.entity.Account">