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

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

@@ -96,10 +96,10 @@
                            {display: '活动地点', name: 'location', width: '10%', align: "left"},
                            {display: '活动说明', name: 'description', width: '10%', align: "left"},
                            {display: '活动类型', name: 'type', width: '10%', align: "left"},
                            {display: '开始时间', name: 'startTime', width: '10%', align: "left"},
                            {display: '结束时间', name: 'endTime', width: '10%', align: "left"},
                            {display: '开始时间', name: 'startTime', width: '10%', align: "center"},
                            {display: '结束时间', name: 'endTime', width: '10%', align: "center"},
                            {
                                display: '活动状态', name: 'status', width: '10%', align: "left",
                                display: '活动状态', name: 'status', width: '10%', align: "center",
                                render: function (row) {
                                    if (row.status == 1) {
                                        return "报名中"

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

@@ -86,10 +86,10 @@
                        columns: [
                            {display: 'id', name: 'id', hide: true},
                            {display: '规则名称', name: 'name', width: '10%', align: "left"},
                            {display: '规则描述', name: 'description', width: '10%', align: "left"},
                            {display: '规则描述', name: 'description', width: '20%', align: "left"},
                            {display: '积分', name: 'integrate', width: '10%', align: "left"},
                            {
                                display: '交易类型', name: 'tradeDirection', width: '10%', align: "left",
                                display: '交易类型', name: 'tradeDirection', width: '10%', align: "center",
                                render: function (row) {
                                    if(row.tradeDirection == 1) {
                                        return "增"
@@ -103,7 +103,7 @@
                                }
                            },
                            {
                                display: '规则类型', name: 'type', width: '10%', align: "left",
                                display: '规则类型', name: 'type', width: '10%', align: "center",
                                render: function (row) {
                                    if (row.type == "NORMAL") {
                                        return "手动"
@@ -115,7 +115,7 @@
                            },
                            {display: 'Java反射类路径', name: 'javaClassPath', width: '10%', align: "left"},
                            {
                                display: '周期', name: 'period', width: '10%', align: "left",
                                display: '周期', name: 'period', width: '10%', align: "center",
                                render: function (row) {
                                    if (row.period == 1) {
                                        return "一次性"
@@ -126,7 +126,7 @@
                                }
                            },
                            {
                                display: '状态', name: 'status', width: '10%', align: "left",
                                display: '状态', name: 'status', width: '10%', align: "center",
                                render: function (row) {
                                    if (row.status == 1) {
                                        return "有效"

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

@@ -86,11 +86,11 @@
                        ajaxHeaderValue: ajaxHeaderValue,
                        columns: [
                            {display: 'id', name: 'id', hide: true},
                            {display: '任务标题', name: 'title', width: '10%', align: "left"},
                            {display: '任务说明', name: 'content', width: '10%', align: "left"},
                            {display: '任务编码', name: 'taskCode', width: '10%', align: "left"},
                            {display: '任务标题', name: 'title', width: '15%', align: "left"},
                            {display: '任务说明', name: 'content', width: '15%', align: "left"},
                            {display: '任务编码', name: 'taskCode', width: '10%', align: "center"},
                            {
                                display: '任务类型', name: 'type', width: '10%', align: "left",
                                display: '任务类型', name: 'type', width: '10%', align: "center",
                                render: function (row) {
                                    if (row.type == "NORMAL_TASK") {
                                        return "普通任务"
@@ -105,20 +105,20 @@
                            },
                            // {display: '业务Id', name: 'startTime', width: '10%', align: "left"},
                            {
                                display: '周期', name: 'period', width: '10%', align: "left",
                                display: '周期', name: 'period', width: '10%', align: "center",
                                render: function (row) {
                                    if (row.period == 1) {
                                        return "一次性"
                                    }
                                    if (row.period == 0) {
                                        return "每天"
                                        return "周期性"
                                    }
                                }
                            },
                            {display: '开始时间', name: 'startTime', width: '10%', align: "left"},
                            {display: '结束时间', name: 'endTime', width: '10%', align: "left"},
                            {display: '开始时间', name: 'startTime', width: '10%', align: "center"},
                            {display: '结束时间', name: 'endTime', width: '10%', align: "center"},
                            {
                                display: '状态', name: 'status', width: '10%', align: "left",
                                display: '状态', name: 'status', width: '10%', align: "center",
                                render: function (row) {
                                    if (row.status == 1) {
                                        return "有效"

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/hos/hospital_list_js.jsp

@@ -77,7 +77,7 @@
										display: '医院类别',
										name: 'level',
										width: '10%',
										align: "center",
										align: "left",
										render: function (row) {
											if (row.level == 1) {
												return "医院";

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/questionnaire/question/question_list_js.jsp

@@ -105,7 +105,7 @@
						ajaxHeaderValue: ajaxHeaderValue,
						columns: [
							{display: 'ID', name: 'id', hide: true},
							{display: '标题', name: 'title', width: '20%', align: "center"},
							{display: '标题', name: 'title', width: '25%', align: "left"},
							{display: '类型', name: 'questionType', width: '10%', align: "center",
								render: function (row) {
									if (Util.isStrEquals(row.questionType, 0)) {
@@ -116,9 +116,9 @@
									return "问答";
								}
							},
							{display: '问题说明', name: 'comment', width: '40%', align: "center"},
							{display: '问题说明', name: 'comment', width: '50%', align: "left"},
							{
								display: '操作', name: 'operator', width: '30%', align: "center", isSort: false,
								display: '操作', name: 'operator', width: '15%', align: "center", isSort: false,
								render: function (row) {
									var html = '';
									html += '<a  href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}','{2}'])", "info:view", row.id, row.questionType) + '">查看</a>';

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/questionnaire/template/template_list_js.jsp

@@ -104,12 +104,12 @@
						ajaxHeaderValue: ajaxHeaderValue,
						columns: [
							{display: 'ID', name: 'id', hide: true},
							{display: '标题', name: 'title', width: '25%', align: "center"},
							{display: '标签', name: 'labelName', width: '20%', align: "center"},
							{display: '说明', name: 'comment', width: '20%', align: "center"},
							{display: '创建人', name: 'createName', width: '15%', align: "center"},
							{display: '标题', name: 'title', width: '15%', align: "left"},
							{display: '标签', name: 'labelName', width: '15%', align: "left"},
							{display: '说明', name: 'comment', width: '50%', align: "left"},
							{display: '创建人', name: 'createName', width: '10%', align: "center"},
							{
								display: '操作', name: 'operator', width: '20%', align: "center", isSort: false,
								display: '操作', name: 'operator', width: '10%', align: "center", isSort: false,
								render: function (row) {
									var html = '';
									html += '<a  href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}','{2}'])", "info:view", row.id, row.labelName) + '">查看</a>';

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/sign/sign_family_list_js.jsp

@@ -148,7 +148,7 @@
								}
							},
							{
								display: '操作', name: 'operator', width: '10%', align: "center", isSort: false,
								display: '操作', name: 'operator', width: '10%', align: "left", isSort: false,
								render: function (row) {
									var html = '';
									html += '<a  href="javascript:void(0)" onclick="javascript:' + Util.format("$.publish('{0}',['{1}'])", "sign:info:view", row.id) + '">明细</a>';

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/sign/sign_team_info_js.jsp

@@ -35,7 +35,7 @@
									{display: '医生名称', name: 'doctorName', width: '10%', align: "left"},
									{display: '联系电话', name: 'mobile', width: '10%', align: "left"},
									{display: '职称', name: 'jobName', width: '10%', align: "left"},
									{display: '医生角色', name: 'levelName', width: '10%', align: "center"},
									{display: '医生角色', name: 'levelName', width: '10%', align: "left"},
									{display: '加入团队时间', name: 'joinTime', width: '12%', align: "left"},
									{display: '最后修改时间', name: 'lastModified', width: '13%', align: "left"},
									{

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/static/pay_log_list_js.jsp

@@ -94,14 +94,14 @@
                            },
                            {display: '业务内容', name: 'content', width: '10%', align: "left"},
                            {display: '调用接口', name: 'api', width: '10%', align: "left"},
                            {display: '调用方式', name: 'method', width: '5%', align: "left"},
                            {display: '调用方式', name: 'method', width: '5%', align: "center"},
                            {display: '调用参数', name: 'params', width: '10%', align: "left"},
                            {display: '调用头部信息', name: 'header', width: '10%', align: "left"},
                            {display: '返回结果', name: 'response', width: '10%', align: "left"},
                            {display: '错误信息', name: 'error', width: '10%', align: "left"},
                            {display: '重试次数', name: 'retryTimes', width: '5%', align: "left"},
                            {
                                display: '状态', name: 'status', width: '5%', align: "left",
                                display: '状态', name: 'status', width: '5%', align: "center",
                                render: function (row) {
                                    if (row.status == 0) {
                                        return "失败"