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

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/feedback/AppealService.java

@@ -15,6 +15,7 @@ import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
@@ -45,6 +46,8 @@ public class AppealService extends BaseService {
    private SMSService smsService;
    @Autowired
    private SMSDao smsDao;
    @Value("${image.imgUrlDomain}")
    private String imgUrlDomain;
    /**
     * 分页查找问题
@@ -151,6 +154,7 @@ public class AppealService extends BaseService {
        map.put("idcard", appeal.getIdcard());
        map.put("images", images);
        map.put("result", result);
        map.put("imgUrlDomain", imgUrlDomain);
        if (status == 0){
            appealDao.modifyAppealStatus(id,1);
        }
@@ -210,6 +214,7 @@ public class AppealService extends BaseService {
        sms.setIp("127.0.0.1");
        sms.setType(11);
        sms.setStatus(1);
        sms.setCaptcha("");
        smsDao.save(sms);
        if (json == null) {
            // 发送失败

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/feedback/FeedbackService.java

@@ -9,6 +9,7 @@ import com.yihu.wlyy.repository.MessageDao;
import com.yihu.wlyy.repository.PatientDao;
import com.yihu.wlyy.repository.feedback.FeedbackDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.HttpClientUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.NameValuePair;
@@ -152,7 +153,7 @@ public class FeedbackService extends BaseService {
        map.put("phone", feedback.getPhone());
        map.put("idcard", feedback.getIdcard());
        map.put("result", feedback.getResult());
        map.put("createTime", feedback.getCreateTime());
        map.put("createTime", DateUtil.dateToStrLong(feedback.getCreateTime()));
        map.put("description", description);
        map.put("images", images);
        map.put("imgUrlDomain", imgUrlDomain);

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/appeal/appeal_detail.jsp

@@ -162,7 +162,7 @@
        <div class="m-form-group ad-result" id="dealResult" style="display: none;">
            <label class="label_title ad-label">处理结果:</label>
            <div class="ad-pd">
                <textarea class="fd-input fd-autoh"  id="result1"></textarea>
                <textarea class="fd-input fd-autoh"  id="result1" style="width: 600px; height: 100px"></textarea>
            </div>
        </div>
        <div class="m-form-group" style="text-align: center;margin-top:30px;">

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/appeal/appeal_detail_js.jsp

@@ -75,7 +75,7 @@
                                    var arr = data.images.split(',');
                                    var html="";
                                    for(var i=0;i<arr.length;i++){
                                        html += '<img src="'+arr[i]+'" alt="."/>';
                                        html += '<img src="'+data.imgUrlDomain+arr[i]+'" alt="."/>';
                                    }
                                    _this.$image.html(html);
                                }else{
@@ -104,23 +104,27 @@
                    var result = $("#result").val();
                    var id = $("#id").val();
                    if (isNoEmpty(result)) {
                        $.ajax({
                            url: ctx + "/admin/appeal/dealAppeal",
                            method: "post",
                            dataType: "json",
                            data: {id: id,
                                result:result
                            },
                            success: function (result) {
                                if (result.status == '200') {
                                    //todo  操作成功后的处理
                                    alert("操作成功");
                                    parent.window.closeParentInfoDialog();
                                }else{
                                    $.Notice.error(result.msg);
                                }
                            },
                        })
                        if(result.length>400){
                            $.Notice.error("最多只能填写400个字");
                        }else {
                            $.ajax({
                                url: ctx + "/admin/appeal/dealAppeal",
                                method: "post",
                                dataType: "json",
                                data: {id: id,
                                    result:result
                                },
                                success: function (result) {
                                    if (result.status == '200') {
                                        //todo  操作成功后的处理
                                        alert("操作成功");
                                        parent.window.closeParentInfoDialog();
                                    }else{
                                        $.Notice.error(result.msg);
                                    }
                                },
                            })
                        }
                    }else{
                        //todo
                        $.Notice.error("请输入处理结果");

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/appeal/appeal_list_js.jsp

@@ -161,7 +161,13 @@
                                }
                            },
                            {display: '提出人', name: 'name', width: '15%', align: "center"},
                            {display: '申诉时间', name: 'createTime', width: '20%', align: "center"},
                            {display: '申诉时间', name: 'createTime', width: '20%', align: "center",
                                render:function (row) {
                                    if(row.createTime){
                                        return row.createTime.substr(0,19);
                                    }
                                }
                            },
                            {display: '联系方式', name: 'phone', width: '20%', align: "center"},
                            {display: '身份', name: 'identity', width: '15%', align: "center",
                                render:function (row) {

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/feedback/feeback_detail.jsp

@@ -134,7 +134,7 @@
            </div>
            <label class="label_title fd-label">联系方式:</label>
            <div class="l-text-wrapper m-form-control">
                <input class="fd-input" type="text" id="phone" />
                <input class="fd-input" type="text" id="contact" />
            </div>
        </div>
        <div class="m-form-group" style="">
@@ -142,6 +142,12 @@
            <div class="l-text-wrapper m-form-control">
                <input class="fd-input" type="text" id="idcard" />
            </div>
            <label class="label_title fd-label">手机号码:</label>
            <div class="l-text-wrapper m-form-control">
                <input class="fd-input" type="text" id="phone" />
            </div>
        </div>
        <div class="m-form-group" style="">
            <label class="label_title fd-label">反馈时间:</label>
            <div class="l-text-wrapper m-form-control">
                <input class="fd-input" type="text" id="createTime" />
@@ -163,7 +169,7 @@
        <div class="m-form-group ad-result" id="dealResult" style="display: none;">
            <label class="label_title ad-label">处理结果:</label>
            <div class="ad-pd">
                <textarea class="fd-input fd-autoh"  id="result1"></textarea>
                <textarea class="fd-input fd-autoh"  id="result1" style="width: 600px; height: 100px"></textarea>
            </div>
        </div>
        <div class="m-form-group" style="text-align: center;margin-top:30px;">

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/feedback/feedback_detail_js.jsp

@@ -27,6 +27,7 @@
            $name: $("#name"),
            $identity:$("#identity"),
            $phone:$("#phone"),
            $contact:$("#contact"),
            $idcard:$("#idcard"),
            $createTime:$("#createTime"),
            $result:$("#result1"),//处理结果
@@ -61,6 +62,7 @@
                                    _this.$identity.val("医生");
                                }
                                _this.$phone.val(data.phone);
                                _this.$contact.val(data.contact);
                                _this.$idcard.val(data.idcard);
                                _this.$createTime.val(data.createTime);
                                _this.$description.val(data.description);
@@ -98,27 +100,35 @@
                $("#back").click(function () {
                    parent.window.closeParentInfoDialog();
                });
                $("#close").click(function () {
                    parent.window.closeParentInfoDialog();
                });
                $("#sure").click(function () {
                    var result = $("#result").val();
                    var id = $("#id").val();
                    if (isNoEmpty(result)) {
                        $.ajax({
                            url: ctx + "/admin/feedback/dealFeedback",
                            method: "post",
                            dataType: "json",
                            data: {id: id,
                                result:result
                            },
                            success: function (result) {
                                if (result.status == '200') {
                                    //todo  操作成功后的处理
                                    alert("操作成功");
                                    parent.window.closeParentInfoDialog();
                                }else{
                                    $.Notice.error(result.msg);
                                }
                            },
                        })
                        if(result.length>400){
                            $.Notice.error("最多只能填写400个字");
                        }else {
                            $.ajax({
                                url: ctx + "/admin/feedback/dealFeedback",
                                method: "post",
                                dataType: "json",
                                data: {id: id,
                                    result:result
                                },
                                success: function (result) {
                                    if (result.status == '200') {
                                        //todo  操作成功后的处理
                                        alert("操作成功");
                                        parent.window.closeParentInfoDialog();
                                    }else{
                                        $.Notice.error(result.msg);
                                    }
                                },
                            })
                        }
                    }else{
                        //todo
                        $.Notice.error("请输入处理结果");

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/feedback/feedback_list_js.jsp

@@ -158,8 +158,14 @@
                                }
                            },
                            {display: '提出人', name: 'createrName', width: '10%', align: "center"},
                            {display: '反馈时间', name: 'createTime', width: '20%', align: "center"},
                            {display: '联系方式', name: 'phone', width: '20%', align: "center"},
                            {display: '反馈时间', name: 'createTime', width: '20%', align: "center",
                                render:function (row) {
                                    if(row.createTime){
                                        return row.createTime.substr(0,19);
                                    }
                                }
                            },
                            {display: '联系方式', name: 'contact', width: '20%', align: "center"},
                            {display: '身份', name: 'identity', width: '20%', align: "center",
                                render:function (row) {
                                    if (Util.isStrEquals(row.identity,1)){