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

# Conflicts:
#	patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/specialty/index.jsp

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/specialist/HospitalServiceItemDO.java

@@ -41,6 +41,12 @@ public class HospitalServiceItemDO extends IdEntityWithOperation implements Seri
    @Column(name = "expense")
    private Integer expense;//价格
    @Transient
    private String title;//标题
    @Transient
    private String content;//内容
    @Transient
    private Integer flag;//标识（1：社区，2、医院，3、社区、医院）
@@ -50,6 +56,9 @@ public class HospitalServiceItemDO extends IdEntityWithOperation implements Seri
    @Transient
    private SpecialistServiceItemDO specialistServiceItemDO;
    public HospitalServiceItemDO() {
    }
    @Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
@@ -139,4 +148,22 @@ public class HospitalServiceItemDO extends IdEntityWithOperation implements Seri
    public void setImediate(Integer imediate) {
        this.imediate = imediate;
    }
    @Transient
    public String getTitle() {
        return title;
    }
    public void setTitle(String title) {
        this.title = title;
    }
    @Transient
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/specialist/ServiceItemService.java

@@ -192,11 +192,10 @@ public class ServiceItemService extends BaseService {
                String value = sheet.getCell(index-1, finalRow).getContents().trim();
                excelData.transform(value);
            });
            JSONObject object = JSONObject.parseObject(itemDO.toString());
            array.add(object);
            array.add(itemDO);
        }
        String response = null;
        String url =getBaseUrl() + "importData1";
        String url ="http://localhost:10051/svr-specialist/"/*getBaseUrl()*/ + "importData1";
        Map<String,String> params = new HashMap<>();
        params.put("serviceItems",array.toJSONString());
        try {

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/specialist/SpecialistHospitalItemService.java

@@ -190,17 +190,18 @@ public class SpecialistHospitalItemService extends BaseService {
        JSONArray array = new  JSONArray();
        for (int row = 1; row < rows; row++) {  //索引从0开始，第一行为标题
            HospitalServiceItemDO hospitalServiceItemDO = new HospitalServiceItemDO();
            Map<Integer, ExcelData> mapping = mapping(hospitalServiceItemDO);
            Map<Integer, ExcelData> mapping = mapping1(hospitalServiceItemDO);
            int finalRow = row;
            mapping.forEach((index, excelData) -> {
                String value = sheet.getCell(index, finalRow).getContents().trim();
                String value = sheet.getCell(index-1, finalRow).getContents().trim();
                excelData.transform(value);
            });
            JSONObject object = JSONObject.parseObject(hospitalServiceItemDO.toString());
            array.add(object);
            Hospital hospital = hospitalDao.findByName(hospitalServiceItemDO.getHospitalName());
            hospitalServiceItemDO.setHospital(hospital.getCode());
            array.add(hospitalServiceItemDO);
        }
        String response = null;
        String url =getBaseUrl() + "importData2";
        String url =/*getBaseUrl()*/"http://localhost:10051/svr-specialist/" + "importData2";
        Map<String,String> params = new HashMap<>();
        params.put("hospitalItems",array.toJSONString());
        try {
@@ -219,33 +220,33 @@ public class SpecialistHospitalItemService extends BaseService {
     * @param hospitalServiceItemDO
     * @return
     */
    private Map<Integer, ExcelData> mapping(HospitalServiceItemDO hospitalServiceItemDO) {
    private Map<Integer, ExcelData> mapping1(HospitalServiceItemDO hospitalServiceItemDO) {
        Map<Integer, ExcelData> dataMap = new HashMap<>();
        //医院名称
        dataMap.put(1, new ExcelData() {
            @Override
            public void transform(String data) {
                hospitalServiceItemDO.setHospital(hospitalServiceItemDO.getHospital());
                hospitalServiceItemDO.setHospitalName(data);
            }
        });
        //医院名称
        //服务项目标题
        dataMap.put(2, new ExcelData() {
            @Override
            public void transform(String data) {
                hospitalServiceItemDO.setHospitalName(hospitalServiceItemDO.getHospitalName());
                hospitalServiceItemDO.setTitle(data);
            }
        });
        //服务项目id
        //服务项目内容
        dataMap.put(3, new ExcelData() {
            @Override
            public void transform(String data) {
                hospitalServiceItemDO.setServiceItemId(hospitalServiceItemDO.getServiceItemId());
                hospitalServiceItemDO.setContent(data);
            }
        });
        //服务项目名称
        dataMap.put(4, new ExcelData() {
            @Override
            public void transform(String data) {
                hospitalServiceItemDO.setServiceItemName(hospitalServiceItemDO.getServiceItemName());
                hospitalServiceItemDO.setExpense(Integer.parseInt(data));
            }
        });
        hospitalServiceItemDO.setSaasId("dev");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/message/MessageService.java

@@ -253,6 +253,7 @@ public class MessageService extends BaseService {
        }
        //专科1、全科2
        //专科消息
        List<Message> specialistList = new ArrayList<>();
        if (flag!=null){