通话标签；居民端已接种记录

common/common-entity/src/main/java/com/yihu/wlyy/entity/call/CallRecord.java

@@ -36,6 +36,7 @@ public class CallRecord extends IdEntity {
    private String  doctorName; //签约医生姓名
    private Long  adminTeamCode; //团队id
    private Integer transferState;//转接状态1.成功 2.失败
    private String callLabel;//通话标签，多个逗号隔开。
    public String getCode() {
        return code;
@@ -214,4 +215,12 @@ public class CallRecord extends IdEntity {
    public void setTransferState(Integer transferState) {
        this.transferState = transferState;
    }
    public String getCallLabel() {
        return callLabel;
    }
    public void setCallLabel(String callLabel) {
        this.callLabel = callLabel;
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/synergy/customer/CustomerSynergyManageController.java

@@ -10,6 +10,7 @@ import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.*;
@@ -24,10 +25,14 @@ import java.util.Map;
@Api(description = "集美客服系统")
public class CustomerSynergyManageController extends BaseController {
    public static final String CALL_LABEL="CALL_LABEL";
    @Autowired
    private SynergyManageService synergyManageService;
    @Autowired
    private UserService userService;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @RequestMapping(value = "/getWorkOrderInfo", method = {RequestMethod.GET, RequestMethod.POST})
    @ApiOperation(value = "获取协同服务工单信息")
    public String getWorkOrderInfo(@ApiParam(name="workorderCode",value="协同服务工单code")
@@ -181,4 +186,31 @@ public class CustomerSynergyManageController extends BaseController {
            return error(-1,"获取失败");
        }
    }
    @RequestMapping(value = "getCallLabelList",method = RequestMethod.GET)
    @ApiOperation(value = "显示所有通话标签")
    public String getCallLabelList(){
        try{
            String sql ="SELECT `code`,`value`,sort FROM system_dict WHERE dict_name='"+CALL_LABEL+"'";
            return write(200,"查询成功！","data",jdbcTemplate.queryForList(sql));
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"查询失败！");
        }
    }
    @RequestMapping(value = "saveCallLabel",method = RequestMethod.POST)
    @ApiOperation(value = "显示所有通话标签")
    public String saveCallLabel(@ApiParam(name="callCode",value="通话记录code")@RequestParam(required = false)String callCode,
                                @ApiParam(name="callLabels",value="通话标签，多个用逗号隔开")@RequestParam(required = false)String callLabels){
        try{
            String sql ="UPDATE manage_call_record SET call_label='"+callLabels+"' WHERE `code`='"+callCode+"'";
            jdbcTemplate.update(sql);
            return write(200,"保存成功！");
        }catch (Exception e){
            e.printStackTrace();
            return write(-1,"保存失败！");
        }
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/call/CallRecord.java

@@ -36,6 +36,7 @@ public class CallRecord extends IdEntity {
    private String  doctorName; //签约医生姓名
    private Long  adminTeamCode; //团队id
    private Integer transferState;//转接状态1.成功 2.失败
    private String callLabel;//通话标签，多个逗号隔开。
    public String getCode() {
        return code;
@@ -214,4 +215,12 @@ public class CallRecord extends IdEntity {
    public void setTransferState(Integer transferState) {
        this.transferState = transferState;
    }
    public String getCallLabel() {
        return callLabel;
    }
    public void setCallLabel(String callLabel) {
        this.callLabel = callLabel;
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/synergy/ManageSynergyWorkorderServicerDO.java

@@ -34,7 +34,6 @@ public class ManageSynergyWorkorderServicerDO extends IdEntity {
    private String townName;//区县名称
    private String relationCode;//工单类型所关联的业务code
    private String relationCodeName;//关联业务名称
    private String callCode;//通话记录code
    @Column(name = "code")
    public String getCode() {
@@ -198,15 +197,6 @@ public class ManageSynergyWorkorderServicerDO extends IdEntity {
        this.relationCode = relationCode;
    }
    @Column(name = "call_code")
    public String getCallCode() {
        return callCode;
    }
    public void setCallCode(String callCode) {
        this.callCode = callCode;
    }
    @Column(name = "workorder_type")
    public Integer getWorkorderType() {
        return workorderType;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/family/FamilyMemberController.java

@@ -1,5 +1,6 @@
package com.yihu.wlyy.web.patient.family;
import com.yihu.wlyy.aop.ObserverRequired;
import com.yihu.wlyy.entity.imm.ChildImmuneVaccin;
import com.yihu.wlyy.entity.imm.ChildInfo;
import com.yihu.wlyy.entity.imm.ChildInfoVO;
@@ -10,6 +11,7 @@ import com.yihu.wlyy.repository.patient.PatientFamilyMemberDao;
import com.yihu.wlyy.service.app.family.FamilyMemberService;
import com.yihu.wlyy.service.imm.ChildFamilyImmuneService;
import com.yihu.wlyy.service.imm.ChildInfoService;
import com.yihu.wlyy.service.third.guahao.ImmuneService;
import com.yihu.wlyy.util.MD5;
import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
@@ -44,6 +46,8 @@ public class FamilyMemberController extends WeixinBaseController {
    private ChildInfoService childInfoService;
    @Autowired
    private ChildFamilyImmuneService childFamilyImmuneService;
    @Autowired
    private ImmuneService immuneService;
    
    /**
@@ -556,4 +560,26 @@ public class FamilyMemberController extends WeixinBaseController {
            return error(-1, "查询失败");
        }
    }
    @RequestMapping(value = "/imm/findYzymBymykh", method = RequestMethod.GET)
    @ResponseBody
    @ObserverRequired
    @ApiOperation("计免：获取计划免疫接种记录")
    public String findWzymBymykh (@ApiParam(name = "barCode", value = "条形编码", defaultValue = "0052248552")
                                  @RequestParam(value = "barCode", required = true) String barCode){
        try{
            String re = immuneService.findYzymBymykh(barCode);
            JSONObject jsonObject = new JSONObject(re);
            if (jsonObject.getInt("status")==200){
                JSONObject json = new JSONObject(jsonObject.getString("data"));
                return write(200, "查询成功","data",json.getJSONArray("body"));
            }else {
                return error(-1,jsonObject.getString("error")+"--"+jsonObject.getString("message") );
            }
        }catch (Exception e){
            error(e);
            return error(-1, e.getMessage());
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/gateway/controller/message/GcOtherMessageController.java

@@ -78,7 +78,11 @@ public class GcOtherMessageController {
            System.out.println("param3-------"+type);
            System.out.println("param4-------"+url);
            Patient patient =  patientDao.findBySsc(cardNo);
            SignFamily signFamily = signFamilyDao.findByPatient(patient.getCode());
            SignFamily signFamily = null;
            if (patient!=null){
                signFamily = signFamilyDao.findByPatient(patient.getCode());
            }
            if (signFamily==null){
                return new BaseResultModel(BaseResultModel.statusEm.opera_error.getCode(),BaseResultModel.statusEm.opera_error.getMessage()+"签约信息错误！");
            }
@@ -97,6 +101,9 @@ public class GcOtherMessageController {
                weiXinTempMsgSendUtils.sendTemplateMessage(templateId, patient.getOpenid(), url, new JSONObject(templateJson));
            }
            if ("oULM4xPHQO1MYOPJdI9AtVKx3fIo".equals(patient.getOpenid())){
                weiXinTempMsgSendUtils.sendTemplateMessage(templateId, patient.getOpenid(), url, new JSONObject(templateJson));
            }
            return new BaseResultModel(BaseResultModel.statusEm.success.getCode(),BaseResultModel.statusEm.success.getMessage());
        } catch (Exception e) {
            e.printStackTrace();