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

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/manager/healthbank/TaskRuleController.java

@@ -72,6 +72,7 @@ public class TaskRuleController extends BaseController {
            @RequestParam(value = "page",required = false) Integer page,
            @RequestParam(value = "rows",required = false) Integer pageSize){
        try{
            taskRule = "{" + taskRule + "}";
            if(StringUtils.isNotBlank(name)){
                taskRule = taskRule.replace("}",",\"name\":"+name+"}");
            }

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/healthbank/task_modify_js.jsp

@@ -96,7 +96,7 @@
                            async:false,
                            dataType : "json",
                            // method: "post",
                            url: ctx + "/admin/taskRule/list?taskRule={\"status\":\"1\"}&page=1&rows=20",
                            url: ctx + '/admin/taskRule/list?taskRule="status":1&page=1&rows=20',
                            // data: {"taskRule":"{\"status\":\"1\"}","page":1,"rows":20},
                            processResults: function (data, page) {
                                if(data.status==200) {

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

@@ -693,6 +693,8 @@ public class DoctorPatientGroupController extends BaseController {
                    jtJson.put("expensesTime", jtSign.getExpensesTime() == null ? "" : new SimpleDateFormat("yyyy-MM-dd HH:mm").format(jtSign.getExpensesTime()));
                    jtJson.put("jyDate", DateUtil.dateToStr(jtSign.getApplyUnsignDate(), DateUtil.YYYY_MM_DD));
                    jtJson.put("status", jtSign.getStatus());
                    jtJson.put("serverType", jtSign.getServerType());
                    jtJson.put("serverTypeName", jtSign.getServerTypeName());
                    Doctor d =  doctorInfoService.findDoctorByCode(jtSign.getDoctor());
                    jtJson.put("doctor",jtSign.getDoctor());