Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

common/common-entity/src/main/java/com/yihu/wlyy/entity/application/Application.java

@@ -0,0 +1,89 @@
package com.yihu.wlyy.entity.application;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * 应用表
 * Created by yeshijie on 2017/11/13.
 */
@Entity
@Table(name = "wlyy_application")
public class Application extends IdEntity{
    String code;//应用code
    String type;//类型（1pcim,）
    String name;//应用名称
    String icon;//应用图标
    String url;//链接地址
    String hospitals;//有权限访问的机构（如果为空，则都可以访问，否则，以逗号分隔可以访问的机构）
    String del;//删除标志（1正常，0删除）
    Date createTime;//创建时间
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getIcon() {
        return icon;
    }
    public void setIcon(String icon) {
        this.icon = icon;
    }
    public String getUrl() {
        return url;
    }
    public void setUrl(String url) {
        this.url = url;
    }
    public String getHospitals() {
        return hospitals;
    }
    public void setHospitals(String hospitals) {
        this.hospitals = hospitals;
    }
    public String getDel() {
        return del;
    }
    public void setDel(String del) {
        this.del = del;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
}

common/common-entity/src/main/java/com/yihu/wlyy/entity/dict/Icd10Dict.java

@@ -14,7 +14,7 @@ public class Icd10Dict {
    private String code;//'icd10字典编码'
    private String name;//'icd10字典名称'
    private String phoneticCode;//字典名称拼音首字母
    private String chronicFlag;//是否慢病
    private String chronicFlag;//是否慢病 1是,0或null为否
    private String infectiousFlag;//是否传染病
    private String description;//'描述'
    private String createUser;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/application/ApplicationDao.java

@@ -0,0 +1,19 @@
package com.yihu.wlyy.repository.application;
import com.yihu.wlyy.entity.address.Country;
import com.yihu.wlyy.entity.application.Application;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created by yeshijie on 2017/11/13.
 */
public interface ApplicationDao extends PagingAndSortingRepository<Application, Long>, JpaSpecificationExecutor<Application> {
    @Query("from Application a where a.type=?1 and a.del= '1' and (a.hospitals is null or a.hospitals = '' or a.hospitals = ?2)")
    List<Application> findByTypeAndHopital(String type,String hospital);
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/application/ApplicationService.java

@@ -0,0 +1,49 @@
package com.yihu.wlyy.service.app.application;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.wlyy.entity.application.Application;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.repository.application.ApplicationDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.service.BaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * Created by yeshijie on 2017/11/13.
 */
@Service
public class ApplicationService extends BaseService{
    @Autowired
    private ApplicationDao applicationDao;
    @Autowired
    private DoctorDao doctorDao;
    /**
     * 获取应用
     * @param type
     * @param doctor
     * @return
     */
    public JSONArray getAppList(String type,String doctor){
        JSONArray re = new JSONArray();
        Doctor d = doctorDao.findByCode(doctor);
        List<Application> appList = applicationDao.findByTypeAndHopital(type,d.getHospital());
        appList.forEach(application -> {
            JSONObject json = new JSONObject();
            json.put("name",application.getName());
            json.put("code",application.getCode());
            json.put("icon",application.getIcon());
            json.put("type",application.getType());
            json.put("url",application.getUrl());
            re.add(json);
        });
        return re;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/application/ApplicationController.java

@@ -0,0 +1,38 @@
package com.yihu.wlyy.web.doctor.application;
import com.alibaba.fastjson.JSONArray;
import com.yihu.wlyy.service.app.application.ApplicationService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
/**
 * Created by yeshijie on 2017/11/13.
 */
@RestController
@RequestMapping(value = "/doctor/application", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "应用")
public class ApplicationController extends BaseController{
    @Autowired
    private ApplicationService applicationService;
    @RequestMapping(value = "getApplist", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("获取pcim应用列表")
    public String getApplist() {
        try {
            JSONArray re = applicationService.getAppList("1",getUID());
            return write(200, "获取成功！", "data", re);
        } catch (Exception e) {
            error(e);
            return error(-1, "获取失败");
        }
    }
}