Merge branch 'dev' of http://192.168.1.220:10080/jiwei/wlyy2.0 into dev

# Conflicts:
#	common/common-entity/src/main/java/com/yihu/jw/entity/base/team/BaseTeamDO.java

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/HospitalServiceItemDO.java

@@ -41,6 +41,12 @@ public class HospitalServiceItemDO extends UuidIdentityEntityWithOperator implem
    @Column(name = "expense")
    private Integer expense;//价格
    @Transient
    private String title;//服务项目名称
    @Transient
    private String content;//服务项目内容
    @Transient
    private Integer flag;//标识（1：社区，2、医院，3、社区、医院）
@@ -139,4 +145,22 @@ public class HospitalServiceItemDO extends UuidIdentityEntityWithOperator implem
    public void setImediate(Integer imediate) {
        this.imediate = imediate;
    }
    @Transient
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    @Transient
    public String getTitle() {
        return title;
    }
    public void setTitle(String title) {
        this.title = title;
    }
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/controller/SpecialistServiceItemController.java

@@ -155,7 +155,7 @@ public class SpecialistServiceItemController extends EnvelopRestEndpoint {
     *
     * @return
     */
    @RequestMapping(value = "importData")
    @RequestMapping(value = "importData1")
    @ResponseBody
    public MixEnvelop<Boolean,Boolean> importData(@ApiParam(name = "serviceItems", value = "服务项目集合")
                                                      @RequestParam(value = "serviceItems")String serviceItems) {

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/dao/SpecialistServiceItemDao.java

@@ -6,6 +6,7 @@ import com.yihu.jw.entity.specialist.SpecialistServiceItemDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import sun.plugin.javascript.navig.LinkArray;
import java.util.List;
@@ -20,5 +21,8 @@ public interface SpecialistServiceItemDao extends PagingAndSortingRepository<Spe
    @Query("select p from SpecialistServiceItemDO p where p.title =?1")
    public List<SpecialistServiceItemDO> findByTitle(String title);
    @Query("select p from SpecialistServiceItemDO p where p.title =?1 and p.content=?2")
    public List<SpecialistServiceItemDO> findByTitleAndContent(String title,String content);
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/SpecialistHospitalServiceItemService.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Service;
import javax.transaction.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.UUID;
@@ -48,6 +49,8 @@ public class SpecialistHospitalServiceItemService extends EnvelopRestEndpoint {
        MixEnvelop<HospitalServiceItemDO,HospitalServiceItemDO> envelop = new MixEnvelop<>();
        if (hospitalServiceItemDOS !=null && hospitalServiceItemDOS.size()!=0){
            for (HospitalServiceItemDO hospitalServiceItemDO:hospitalServiceItemDOS){
                hospitalServiceItemDO.setCreateTime(new Date());
                hospitalServiceItemDO.setUpdateTime(new Date());
                specialistHospitalServiceItemDao.save(hospitalServiceItemDO);
            }
        }
@@ -356,13 +359,22 @@ public class SpecialistHospitalServiceItemService extends EnvelopRestEndpoint {
        MixEnvelop<Boolean,Boolean> envelop = new MixEnvelop<>();
        if (hospitalServiceItemDOS != null && hospitalServiceItemDOS.size()!=0){
            for (HospitalServiceItemDO hospitalServiceItemDO:hospitalServiceItemDOS){
                List<HospitalServiceItemDO> hospitalServiceItemDOList = specialistHospitalServiceItemDao.findByHospitalAndServiceItemId(hospitalServiceItemDO.getHospital(),hospitalServiceItemDO.getServiceItemId());
                if (hospitalServiceItemDOList == null && hospitalServiceItemDOList.size() ==0){
                    continue;
                }else {
                    hospitalServiceItemDO.setStatus(1);
                    hospitalServiceItemDO.setId(UUID.randomUUID().toString());
                    specialistHospitalServiceItemDao.save(hospitalServiceItemDO);
                List<SpecialistServiceItemDO> specialistServiceItemDOS = specialistServiceItemDao.findByTitleAndContent(hospitalServiceItemDO.getTitle(),hospitalServiceItemDO.getContent());
                if (specialistServiceItemDOS != null && specialistServiceItemDOS.size()!=0){
                    List<HospitalServiceItemDO> hospitalServiceItemDOList = specialistHospitalServiceItemDao.findByHospitalAndServiceItemId(hospitalServiceItemDO.getHospital(),specialistServiceItemDOS.get(0).getId());
                    if (hospitalServiceItemDOList == null && hospitalServiceItemDOList.size() ==0){
                        continue;
                    }else {
                        hospitalServiceItemDO.setStatus(1);
                        hospitalServiceItemDO.setImediate(0);
                        hospitalServiceItemDO.setSaasId("dev");
                        hospitalServiceItemDO.setId(UUID.randomUUID().toString());
                        hospitalServiceItemDO.setServiceItemId(specialistServiceItemDOS.get(0).getId());
                        hospitalServiceItemDO.setServiceItemName(specialistServiceItemDOS.get(0).getDiseaseItem());
                        hospitalServiceItemDO.setCreateTime(new Date());
                        hospitalServiceItemDO.setUpdateTime(new Date());
                        specialistHospitalServiceItemDao.save(hospitalServiceItemDO);
                    }
                }
            }
        }

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/SpecialistServiceItemService.java

@@ -51,6 +51,8 @@ public class SpecialistServiceItemService {
     */
    public MixEnvelop<Boolean,Boolean> insert(SpecialistServiceItemDO specialistServiceItemDO){
        MixEnvelop<Boolean,Boolean> envelop = new MixEnvelop<>();
        specialistServiceItemDO.setCreateTime(new Date());
        specialistServiceItemDO.setUpdateTime(new Date());
        specialistServiceItemDao.save(specialistServiceItemDO);
        envelop.setObj(true);
        return envelop;
@@ -205,6 +207,8 @@ public class SpecialistServiceItemService {
                }else {
                    specialistServiceItemDO.setStatus(1);
                    specialistServiceItemDO.setId(UUID.randomUUID().toString());
                    specialistServiceItemDO.setCreateTime(new Date());
                    specialistServiceItemDO.setUpdateTime(new Date());
                    specialistServiceItemDao.save(specialistServiceItemDO);
                }
            }