咨询单管理修改

aidea-modules/consult-module-web/src/main/webapp/WEB-INF/views/consultSheet/consultSheetlist.html

@@ -77,13 +77,13 @@
                     <div class="box">
                         <div class="box-header">
                             <form id="seachTableForm" action="#springUrl('/a/consultSheet/list')" method="get">
-                                <div class="col-xs-5">
-                                    <div class="col-xs-2">
-                                        <input type="text" class="form-control required"
+                                <div class="col-xs-5" style="width: 800px">
+                                    <div class="col-xs-2" >
+                                        <input type="text" class="form-control required" style="width:  100px"
                                                name="userName" placeholder="用药人姓名">
                                     </div>
                                     <div class="col-xs-2">
-                                        <input type="text" class="form-control required"
+                                        <input type="text" class="form-control required" style="width:  100px"
                                                name="illness" placeholder="病情描述">
                                     </div>
                                     <a href="javascript:void(0)" class="btn btn-primary search">搜索</a>

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/dao/ConsultSheetMapper.xml

@@ -26,7 +26,10 @@
         <result column="allergy" property="allergy"/>
         <result column="symptom" property="symptom"/>
         <result column="diagnosis" property="diagnosis"/>
-
+        <result column="open_id" property="openId"></result>
+        <result column="drugs_id" property="drugsId"></result>
+        <result column="member_id" property="memberId"></result>
+        <result column="order_id" property="orderId"></result>
     </resultMap>
 
     <sql id="sqlWhere">
@@ -80,6 +83,10 @@
 	                                a.allergy,
 	                                a.symptom,
 	                                a.diagnosis,
+	                                a.open_id,
+	                                a.drugs_id,
+	                                a.member_id,
+	                                a.order_id,
 	                                b.`name` pharmaName,
 	                                c.`name` customerName
                         </sql>
@@ -119,7 +126,11 @@
         #{updateBy, jdbcType=VARCHAR},
         #{diagnosis,jdbcType=BIGINT}
         #{doctorName, jdbcType=VARCHAR},
-        #{customerName,jdbcType=BIGINT}
+        #{customerName,jdbcType=BIGINT},
+        #{openId,jdbcType=VARCHAR},
+        #{drugsId,jdbcType=BIGINT},
+        #{memberId,jdbcType=BIGINT},
+        #{orderId,jdbcType=BIGINT}
         )
     </insert>
 
@@ -221,6 +232,18 @@
             <if test="diagnosis != null">
                 diagnosis = #{diagnosis, jdbcType=BIGINT},
             </if>
+            <if test="openId != null">
+                open_id = #{openId, jdbcType=VARCHAR},
+            </if>
+            <if test="openId != null">
+                drugs_id = #{drugsId, jdbcType=BIGINT},
+            </if>
+            <if test="openId != null">
+                member_id = #{memberId, jdbcType=BIGINT},
+            </if>
+            <if test="openId != null">
+                order_id = #{orderId, jdbcType=BIGINT},
+            </if>
         </set>
         where id=#{id,jdbcType=BIGINT}
     </update>

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/model/ConsultSheet.java

@@ -82,8 +82,10 @@ public class ConsultSheet extends UserSheet implements Serializable {
 /* 更新人 */
         private Long updateBy;
 
-
-
+    private String openId;
+    private Long drugsId;
+    private Long memberId;
+    private Long orderId;
 public ConsultSheet() {
                                     this.delFlag = false;
                                 this.status = "0";

behavior-modules/wx-qrcode-module-web/src/main/webapp/WEB-INF/views/wxQrcode/wxQrcodelist.html

@@ -283,7 +283,7 @@
                     "aTargets": [1],
                     "mData": "ticket",
                     "mRender": function (a, b, c, d) {
-                        return '<img src="https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket='+a+'" style="width: 160px;height: 160px;">';
+                        return '<img src="https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket='+a+'" style="width: 160px;height: 120px;">';
 
                     }
                 },{

membercard-modules/shipping-address-web/pom.xml

@@ -8,9 +8,11 @@
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>consult-module-web</artifactId>
+    <groupId>com.cftech</groupId>
+    <artifactId>shipping-address-module</artifactId>
     <packaging>war</packaging>
-    <name>consult-module-web Maven Webapp</name>
+    <name>shipping-address-web Maven Webapp</name>
+    <version>1.0-SNAPSHOT</version>
     <url>http://maven.apache.org</url>
     <dependencies>
         <dependency>