Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/prescription/prescription_info_js.jsp

@@ -100,7 +100,7 @@
                                    $('#reviewedTime').val(reviewedTime);
                                    //审核结果
                                    var status = data.prescription.status;
                                    var status = data.reviewed.status;
                                    if(status ==  -2){
                                        $('#presult').val("删除")
                                    }else if (status ==  -1){

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/prescription/prescription_order.jsp

@@ -61,6 +61,12 @@
                <input id="expressageHospitalAddress" readonly class="fd-input" type="text"   />
            </div>
        </div>
        <div class="m-form-group" style="display: none" id="expressmailnodiv">
            <label class="label_title fd-label">快递单号</label>
            <div class="l-text-wrapper m-form-control">
                <input id="mailno" readonly class="fd-input" type="text"  />
            </div>
        </div>
        <div style="margin-left:10px;">

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/prescription/prescription_order_js.jsp

@@ -67,6 +67,8 @@
                                            $('#expressaddress').val(expressaddress);
                                            $('#expressageName').val("快递员配送");
                                            $('#expressageHospitalAddress').val(data.prescriptionHospital);
                                            $('#expressmailnodiv').show();
                                            $('#mailno').val(data.prescriptionExpressage.mailno)
                                        }
                                        //订单号
                                        var prescriptionExpresssageCode = data.prescriptionExpressage.code;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/jimeiJkEdu/JMJkEduArticleService.java

@@ -132,7 +132,7 @@ public class JMJkEduArticleService extends BaseService {
            }
            heapm.setSendName(one.getSendName());
            heapm.setSendCode(one.getDoctorCode());
            heapm.setCreateTime(one.getCreateTime());
            heapm.setCreateTime(DateUtil.dateToStrLong(one.getCreateTime()));
            heapm.setArticleId(article.getString("articleId"));
            heapm.setAttachedTitle(article.getString("articleTitle"));
            heapm.setAttachedContent(article.getString("articleContent"));
@@ -163,9 +163,9 @@ public class JMJkEduArticleService extends BaseService {
            result.put(one.getArticleId(), heapm);
        }
        List<HealthEduArticlePatientModel> resultList = new ArrayList<>();
        for (Map.Entry<String, HealthEduArticlePatientModel> entry : result.entrySet()) {
            resultList.add(entry.getValue());
        }
//        for (Map.Entry<String, HealthEduArticlePatientModel> entry : result.entrySet()) {
//            resultList.add(entry.getValue());
//        }
        return resultList;
    }
@@ -610,9 +610,9 @@ public class JMJkEduArticleService extends BaseService {
        if (!StringUtils.isEmpty(labelSex)) {
            whereSql += " and p.sex in (" + labelSex + ") ";
        }
        if (!StringUtils.isEmpty(labelUnit)) {
            whereSql += " and w.hospital in (" + labelUnit + ") ";
        }
//        if (!StringUtils.isEmpty(labelUnit)) {
//            whereSql += " and w.hospital in (" + labelUnit + ") ";
//        }
        List<String> groupPatient = jdbcTemplate.queryForList(tableSql + whereSql, String.class);
        patientSet.addAll(groupPatient);
    }
@@ -761,7 +761,7 @@ public class JMJkEduArticleService extends BaseService {
    }
    private void getPatientByGroup(String userCode,String labelCode, String labelType, Long teamCode, Set<String> patientSet, int page, int pagesize) throws Exception {
        org.json.JSONArray result = signPatientLabelInfoService.getPatientByLabel(userCode, labelCode, labelType, teamCode, page, pagesize, false, "",false);
        org.json.JSONArray result = signPatientLabelInfoService.getPatientByLabel(userCode, labelCode, labelType, teamCode, page, pagesize, false, "",true);
        for (Object o : result) {
            org.json.JSONObject json = (org.json.JSONObject) o;
            String patient = (String) json.get("code");
@@ -911,7 +911,7 @@ public class JMJkEduArticleService extends BaseService {
            heapm = new HealthEduArticlePatientModel();
            heapm.setSendName(one.getSendName());
            heapm.setSendCode(one.getDoctorCode());
            heapm.setCreateTime(one.getCreateTime());
            heapm.setCreateTime(DateUtil.dateToStrLong(one.getCreateTime()));
            heapm.setArticleId(article.getString("articleId"));
            heapm.setAttachedTitle(article.getString("articleTitle"));
            heapm.setAttachedContent(article.getString("articleContent"));

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jkEduArticle/ThirdJkEduArticleService.java

@@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.es.entity.HealthEduArticlePatient;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.util.DateUtil;
@@ -39,6 +41,8 @@ public class ThirdJkEduArticleService extends BaseService {
    private HttpClientUtil httpClientUtil;
    @Autowired
    private DoctorDao doctorDao;
    @Autowired
    private PatientDao patientDao;
    @Value("${es.type.HealthEduArticlePatient}")
    private String esType;
    @Value("${es.index.HealthEduArticlePatient}")
@@ -205,10 +209,21 @@ public class ThirdJkEduArticleService extends BaseService {
        String response = "";
        JSONObject json = null;
        try {
            Doctor doctor = doctorDao.findByCode(userId);
            String orgName = doctor.getHospitalName();//用户所属机构
            String orgId = doctor.getHospital();//用户所属机构ID
            String cName = doctor.getName();//用户名
            String orgName = "";
            String orgId = "";
            String cName = "";
            if(1 == userType){
                Doctor doctor = doctorDao.findByCode(userId);
                orgName = doctor.getHospitalName();//用户所属机构
                orgId = doctor.getHospital();//用户所属机构ID
                cName = doctor.getName();//用户名
            }else if(2 == userType){
                Patient patient = patientDao.findByCode(userId);
                cName = patient.getName();//用户名
            }else{
                new Exception(json.getString("异常userType"));
            }
            JSONObject param = new JSONObject();
            param.put("articleId", articleId);
            param.put("cName", cName);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/jimeiJkEdu/DoctorJMJkEduArticleController.java

@@ -105,7 +105,7 @@ public class DoctorJMJkEduArticleController extends BaseController {
            if(StringUtils.isEmpty(currentRoleLevel)){
                currentRoleLevel = getCurrentRoleLevel();
            }
            List<HealthEduArticlePatientModel> eduArticlePatients = jmJkEduArticleService.pushArticleList(page, pagesize, getUID(),firstLevelCategoryId,secondLevelCategoryId,myArticle,sendType,currentRoleCode,currentRoleLevel,articleTitle,sendTimeStart,sendTimeEnd);
            List<HealthEduArticlePatientModel> eduArticlePatients = jmJkEduArticleService.pushArticleList(page, pagesize, "xh1D2017031502222",firstLevelCategoryId,secondLevelCategoryId,myArticle,sendType,currentRoleCode,currentRoleLevel,articleTitle,sendTimeStart,sendTimeEnd);
//            Long count = jmJkEduArticleService.pushArticleListCount(getUID(),2);
            return new ResultPageListModel(
                    page,
@@ -218,22 +218,44 @@ public class DoctorJMJkEduArticleController extends BaseController {
            @RequestParam(value = "teamCode", required = false) long teamCode,
            @RequestParam(value = "articleId", required = false) String articleId){
        try {
            if (StringUtils.isEmpty(articleId)) {
            String[] articles = new String[]{};
            String[] patients = new String[]{};
            String[] groups = new String[]{};
            if (StringUtils.isBlank(articleId)) {
                return error(-1,"请至少选择一篇文章！");
            }else{
                if(articleId.contains(",")){
                    articles = articleId.split(",");
                }else{
                    articles = new String[]{articleId};
                }
            }
            if (StringUtils.isEmpty(patient) && StringUtils.isEmpty(group)) {
            if (StringUtils.isBlank(patient) && StringUtils.isBlank(group)) {
                return error(-1,"请至少选择一个患者！");
            }else{
                if(StringUtils.isNotBlank(patient)){
                    if(patient.contains(",")){
                        patients = patient.split(",");
                    }else{
                        patients = new String[]{patient};
                    }
                }
                if(StringUtils.isNotBlank(group)){
                    if(group.contains(",")){
                        groups = group.split(",");
                    }else{
                        groups = new String[]{group};
                    }
                }
            }
            String[] articles = articleId.split(",");
            String[] patients = patient.split(",");
            String[] groups = group.split(",");
            
            if (articles.length == 0) {
                return error(-1,"请至少选择一篇文章！");
            }
            if (patients.length == 0 && groups.length == 0) {
                return error(-1,"请至少选择一个患者！");
            }
            
            com.alibaba.fastjson.JSONObject response = jmJkEduArticleService.pushArticleConfirm(getUID(),groups,group,labelType,teamCode,patients,articleId);
            return write(200,"查询成功！","data",response);
        }catch (Exception e) {
@@ -279,15 +301,36 @@ public class DoctorJMJkEduArticleController extends BaseController {
                                              @RequestParam(value = "currentUserRoleLevel", required = false ,defaultValue = "4")String currentUserRoleLevel){
        try {
            String[] articles = new String[]{};
            String[] patients = new String[]{};
            String[] groups = new String[]{};
            if (StringUtils.isEmpty(articleId)) {
                return new BaseResultModel("请至少选择一篇文章！");
            }else{
                if(articleId.contains(",")){
                    articles = articleId.split(",");
                }else{
                    articles = new String[]{articleId};
                }
            }
            if (StringUtils.isEmpty(patient) && StringUtils.isEmpty(group)) {
                return new BaseResultModel("请至少选择一个患者！");
            }else{
                if(StringUtils.isNotBlank(patient)){
                    if(patient.contains(",")){
                        patients = patient.split(",");
                    }else{
                        patients = new String[]{patient};
                    }
                }
                if(StringUtils.isNotBlank(group)){
                    if(group.contains(",")){
                        groups = group.split(",");
                    }else{
                        groups = new String[]{group};
                    }
                }
            }
            String[] articles = articleId.split(",");
            String[] patients = patient.split(",");
            String[] groups = group.split(",");
            if (articles.length == 0) {
                return new BaseResultModel("请至少选择一篇文章！");
            }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/jimeiJkEduPC/DoctorJMJkEduArticlePCController.java

@@ -236,8 +236,8 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
            @ApiParam(name = "sendTimeEnd", value = "发送时间结束", required = false) @RequestParam(value = "sendTimeEnd", required = false) String sendTimeEnd,
            @ApiParam(name = "myArticle", value = "我的文章 1选中0未选", required = false) @RequestParam(value = "myArticle", required = false,defaultValue = "0") Integer myArticle,
            @ApiParam(name = "sendType", value = "1医生 2卫计委（管理员）", required = true) @RequestParam(value = "sendType", required = true) Integer sendType,
            @ApiParam(name = "iDisplayStart", value = "当前页 起始1", required = true) @RequestParam(value = "page", required = true) Integer page,
            @ApiParam(name = "iDisplayLength", value = "每页显示条数", required = true) @RequestParam(value = "pagesize", required = true) Integer pagesize,
            @ApiParam(name = "iDisplayStart", value = "当前页 起始1", required = true) @RequestParam(value = "iDisplayStart", required = true) Integer page,
            @ApiParam(name = "iDisplayLength", value = "每页显示条数", required = true) @RequestParam(value = "iDisplayLength", required = true) Integer pagesize,
            @ApiParam(name = "currentRoleCode", value = "当前登录的角色code", required = false) @RequestParam(value = "currentRoleCode", required = false) String currentRoleCode,
            @ApiParam(name = "currentRoleLevel", value = "当前登录的角色级别", required = false) @RequestParam(value = "currentRoleLevel", required = false) String currentRoleLevel,
            @ApiParam(name = "sEcho", value = "插件自带") @RequestParam(value = "sEcho", required = false) Integer sEcho) {
@@ -249,6 +249,9 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
            if(StringUtils.isEmpty(currentRoleLevel)){
                currentRoleLevel = getCurrentRoleLevel();
            }
            if(page == 0){
                page ++;
            }
            List<HealthEduArticlePatientModel> eduArticlePatients = jmJkEduArticleService.pushArticleList(page, pagesize, getUID(),firstLevelCategoryId,secondLevelCategoryId,myArticle,sendType,currentRoleCode,currentRoleLevel,articleTitle,sendTimeStart,sendTimeEnd);
//            Long count = jmJkEduArticleService.pushArticleListCount(getUID(),2);
            List<HealthEduArticlePatient> eduArticlePatientsCount = jmJkEduArticleService.pushArticleListCount(getUID(),firstLevelCategoryId,secondLevelCategoryId,myArticle,sendType,currentRoleCode,
@@ -257,12 +260,16 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
            obj.put("Code", 100);
            obj.put("Message", "成功");
            JSONArray obj2 = new JSONArray();
            obj2.add(eduArticlePatients);
            if(!eduArticlePatients.isEmpty()){
                for (int i = 0; i < eduArticlePatients.size(); i++) {
                    obj2.add(eduArticlePatients.get(i));
                }
            }
            obj.put("aaData",  obj2.toString());
            obj.put("iTotalDisplayRecords", eduArticlePatientsCount.size());
            obj.put("iTotalRecords", eduArticlePatientsCount.size());
            obj.put("sEcho", sEcho);
            return obj.toString();
            return write(200,"查询成功！","data",obj);
        }catch (Exception e) {
            e.printStackTrace();
            return error(-1,"失败！");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/gateway/vo/HealthEduArticlePatientModel.java

@@ -19,8 +19,7 @@ public class HealthEduArticlePatientModel {
    @ApiModelProperty(value = "发送人名称", required = false, access = "response")
    private String sendName;   // 发送人名称
    @ApiModelProperty(value = "创建时间", required = false, access = "response")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    private Date createTime;  // 创建时间
    private String createTime;  // 创建时间
    @ApiModelProperty(value = "文章id", required = false, access = "response")
    private String articleId;  //文章id
    @ApiModelProperty(value = "文章标题", required = false, access = "response")
@@ -66,11 +65,11 @@ public class HealthEduArticlePatientModel {
        this.sendName = sendName;
    }
    public Date getCreateTime() {
    public String getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
    public void setCreateTime(String createTime) {
        this.createTime = createTime;
    }