Kezdőlap Felfedezés Súgó
Regisztráció Bejelentkezés
trick9191
/
wlyy2.0
másolva Amoy2/wlyy2.0
Figyelés 1
Kedvenc 0
Másolás 0
Fájlok
Forráskód Böngészése

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

huangwenjie 7 éve
szülő
30b0609089 2ce008b2e0
commit
880a696879
5 módosított fájl, 14 hozzáadás és 14 törlés
Osztott Nézet Diff Statisztika Mutatása
  1. 10 10
      patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/healthbank/activity_list.jsp
  2. 1 1
      patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/healthbank/activity_list_js.jsp
  3. 1 1
      patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/healthbank/activity_modify.jsp
  4. 1 1
      patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/healthbank/activity_modify_js.jsp
  5. 1 1
      patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/disease/PatientDiseaseService.java

+ 10 - 10
patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/healthbank/activity_list.jsp
Fájl Megtekintése 

@ -15,33 +15,33 @@
 
<body>
 
<div id="div_wrapper">
 
    <!-- 检索条件 -->
 
    <div class="m-activity-area f-h50 f-dn f-pr m-form-inline" data-role-form style='display: block;'>
 
        <div class="m-form-group f-mt10">
 
            <div class="m-form-control f-ml15">
 
    <div class="m-activity-area f-dn f-pr m-form-inline" data-role-form style='display: block;'>
 
        <div class="m-form-group">
 
            <div class="m-form-control f-ml15 f-mt10">
 
                <input type="text" id="inp_title" placeholder="请输入活动标题" class="f-ml10" data-attr-scan="title"/>
 
            </div>
 
            <div class="m-form-control f-ml15">
 
            <div class="m-form-control f-ml15 f-mt10">
 
                <input type="text" id="inp_location" placeholder="请输入活动地点" class="f-ml10" data-attr-scan="location"/>
 
            </div>
 
            <div class="m-form-control f-ml15">
 
            <div class="m-form-control f-ml15 f-mt10">
 
                <input type="text" id="inp_type" placeholder="请输入活动类型" class="f-ml10" data-attr-scan="type"/>
 
            </div>
 
            <div class="m-form-control f-ml15">
 
            <div class="m-form-control f-ml15 f-mt10">
 
                <input type="text" id="inp_status" placeholder="请输入状态" class="f-ml10" data-attr-scan="status"/>
 
            </div>
 
            <div class="m-form-control f-ml15">
 
            <div class="m-form-control f-ml15 f-mt10">
 
                <input type="text" id="inp_start_time" placeholder="请输入活动开始时间" class="f-ml10" data-attr-scan="startTime"/>
 
            </div>
 
            <div class="m-form-control f-ml15">
 
            <div class="m-form-control f-ml15 f-mt10">
 
                <input type="text" id="inp_end_time" placeholder="请输入活动结束时间" class="f-ml10" data-attr-scan="endTime"/>
 
            </div>
 
            <sec:authorize url="/admin/activity/list">
 
                <div id="btn_search" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam  f-ml10" >
 
                <div id="btn_search" class="m-form-control l-button u-btn u-btn-primary u-btn-small f-ib f-vam  f-ml10 f-mt10" >
 
                    <span>查询</span>
 
                </div>
 
            </sec:authorize>
 
            <sec:authorize url="/admin/activity/create">
 
                <div id="btn_add" class="l-button u-btn u-btn-primary u-btn-small f-ib f-vam  f-ml10" >
 
                <div id="btn_add" class="m-form-control l-button u-btn u-btn-primary u-btn-small f-ib f-vam  f-ml10 f-mt10" >
 
                    <span>新增</span>
 
                </div>
 
            </sec:authorize>

+ 1 - 1
patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/healthbank/activity_list_js.jsp
Fájl Megtekintése 

@ -173,7 +173,7 @@
 
                    $.subscribe('activity:info:edit', function (event, id) {
 
                        var title = '编辑信息';
 
                        self.activityInfoDialog = $.ligerDialog.open({
 
                            height: 700,
 
                            height: 900,
 
                            width: 560,
 
                            urlParms: {"id": id, "type": "edit"},
 
                            title: title,

+ 1 - 1
patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/healthbank/activity_modify.jsp
Fájl Megtekintése 

@ -33,7 +33,7 @@
 
    <div class="m-form-group">
 
        <label class="label_title" style="width:120px">活动说明</label>
 
        <div class="l-text-wrapper m-form-control essential">
 
            <input type="text"  id="inp_description" class="required useTitle ajax f-w240 validate-special-char"  required-title="活动说明不能为空"  data-attr-scan="description"/>
 
            <textarea type="text"  id="inp_description" class="required useTitle ajax f-w240 validate-special-char"  required-title="活动说明不能为空"  data-attr-scan="description"></textarea>
 
        </div>
 
    </div>
 
    <div class="m-form-group">

+ 1 - 1
patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/healthbank/activity_modify_js.jsp
Fájl Megtekintése 

@ -27,7 +27,7 @@
 
                    $("#inp_organizer").ligerTextBox({width: 240}) //主办方&发布机构
 
                    $("#inp_title").ligerTextBox({width: 240})//活动标题
 
                    $("#inp_description").ligerTextBox({width: 240})//活动说明
 
                    $("#inp_description").ligerTextBox({width: 260, height: 240})//活动说明
 
                    $("#inp_location").ligerTextBox({width: 240})//活动地点
 
                    $("#inp_type").ligerTextBox({width: 240})//活动类型
 
                    $("#inp_startTime").ligerDateEditor({

+ 1 - 1
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/disease/PatientDiseaseService.java
Fájl Megtekintése 

@ -510,7 +510,7 @@ public class PatientDiseaseService extends BaseService {
 
                "b.disease_name AS labelName," +
 
                "b.disease AS label " +
 
                "FROM wlyy_specialist.wlyy_specialist_patient_relation a " +
 
                "JOIN wlyy.wlyy_patient_disease_server b ON a.patient=b.patient and b.del=1 " +
 
                "JOIN wlyy.wlyy_patient_disease_server b ON a.id=b.specialist_relation_code and b.del=1 " +
 
                "WHERE a.sign_status> 0 AND a.`status`>=0 AND b.del =1 " +
 
                "AND a.doctor='"+doctor+"' " +
 
                "GROUP BY b.disease";