Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

app/app-iot-server/src/main/resources/application.yml

@@ -16,7 +16,7 @@ spring:
      max-active: 8 # Max number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1  # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
      min-idle: 1  # Target for the minimum number of idle connections to maintain in the pool. This settings only has an effect if it is positive.
  application:
    name: app-iot-server
    message: App IOT Server

app/app-iot-server/src/main/webapp/front/js/lib/plugins/dataTables/jquery.dataTables.js

@@ -1178,7 +1178,7 @@
		if ( $.isPlainObject( mSource ) )
		{
			/* Unlike get, only the underscore (global) option is used for for
			 * setting data since we don't know the type here. This is why an object
			 * settings data since we don't know the type here. This is why an object
			 * option is not documented for `mData` (which is read/write), but it is
			 * for `mRender` which is read only.
			 */
@@ -1220,7 +1220,7 @@
						b.splice( 0, i+1 );
						innerSrc = b.join('.');
						// Traverse each entry in the array setting the properties requested
						// Traverse each entry in the array settings the properties requested
						for ( var j=0, jLen=val.length ; j<jLen ; j++ )
						{
							o = {};
@@ -7220,7 +7220,7 @@
				settings.ajax = url;
			}
			// No need to consider sAjaxSource here since DataTables gives priority
			// to `ajax` over `sAjaxSource`. So setting `ajax` here, renders any
			// to `ajax` over `sAjaxSource`. So settings `ajax` here, renders any
			// value of `sAjaxSource` redundant.
		} );
	} );
@@ -7230,7 +7230,7 @@
	 * Load data from the newly set Ajax URL. Note that this method is only
	 * available when `ajax.url()` is used to set a URL. Additionally, this method
	 * has the same effect as calling `ajax.reload()` but is provided for
	 * convenience when setting a new URL. Like `ajax.reload()` it will
	 * convenience when settings a new URL. Like `ajax.reload()` it will
	 * automatically redraw the table once the remote data has been loaded.
	 *
	 * @returns {DataTables.Api} this
@@ -9589,7 +9589,7 @@
		 * table has already been initialised, this parameter will cause DataTables
		 * to simply return the object that has already been set up - it will not take
		 * account of any changes you might have made to the initialisation object
		 * passed to DataTables (setting this parameter to true is an acknowledgement
		 * passed to DataTables (settings this parameter to true is an acknowledgement
		 * that you understand this). `destroy` can be used to reinitialise a table if
		 * you need.
		 *  @type boolean
@@ -9999,7 +9999,7 @@
		/**
		 * This function allows you to 'post process' each row after it have been
		 * generated for each table draw, but before it is rendered on screen. This
		 * function might be used for setting the row class name etc.
		 * function might be used for settings the row class name etc.
		 *  @type function
		 *  @param {node} row "TR" element for the current row
		 *  @param {array} data Raw data array for this row
@@ -10317,7 +10317,7 @@
		/**
		 * Number of rows to display on a single page when using pagination. If
		 * feature enabled (`lengthChange`) then the end user will be able to override
		 * this to a custom setting using a pop-up menu.
		 * this to a custom settings using a pop-up menu.
		 *  @type int
		 *  @default 10
		 *
@@ -11396,7 +11396,7 @@
		 *    * Parameters:
		 *      * `{array|object}` The data source for the row
		 *      * `{string}` The type call data requested - this will be 'set' when
		 *        setting data or 'filter', 'display', 'type', 'sort' or undefined
		 *        settings data or 'filter', 'display', 'type', 'sort' or undefined
		 *        when gathering data. Note that when `undefined` is given for the
		 *        type DataTables expects to get the raw data for the object back<
		 *      * `{*}` Data to set when the second parameter is 'set'.
@@ -12675,7 +12675,7 @@
		 * Server-side processing - number of records in the result set
		 * (i.e. before filtering), Use fnRecordsTotal rather than
		 * this property to get the value of the number of records, regardless of
		 * the server-side processing setting.
		 * the server-side processing settings.
		 *  @type int
		 *  @default 0
		 *  @private
@@ -12686,7 +12686,7 @@
		 * Server-side processing - number of records in the current display set
		 * (i.e. after filtering). Use fnRecordsDisplay rather than
		 * this property to get the value of the number of records, regardless of
		 * the server-side processing setting.
		 * the server-side processing settings.
		 *  @type boolean
		 *  @default 0
		 *  @private

app/app-iot-server/src/main/webapp/front/js/lib/plugins/datapicker/bootstrap-datepicker.js

@@ -649,11 +649,11 @@
				this.viewDate = new Date(this.o.endDate);
			if (fromArgs){
				// setting date by clicking
				// settings date by clicking
				this.setValue();
			}
			else if (dates.length){
				// setting date by typing
				// settings date by typing
				if (String(oldDates) !== String(this.dates))
					this._trigger('changeDate');
			}

app/app-iot-server/src/main/webapp/front/js/lib/plugins/flot/jquery.flot.js

@@ -63,7 +63,7 @@
                    inverseTransform: null, // if transform is set, this should be the inverse function
                    min: null, // min. value to show, null means set automatically
                    max: null, // max. value to show, null means set automatically
                    autoscaleMargin: null, // margin in % to add if auto-setting min/max
                    autoscaleMargin: null, // margin in % to add if auto-settings min/max
                    ticks: null, // either [1, 3] or [[1, "a"], 3] or (fn: axis info -> ticks) or app. number of ticks for auto-ticks
                    tickFormatter: null, // fn: number -> string
                    labelWidth: null, // size of tick labels in pixels

app/app-iot-server/src/main/webapp/front/js/lib/plugins/treeview/bootstrap-treeview.js

@@ -178,7 +178,7 @@
		},
		// On initialization recurses the entire tree structure
		// setting expanded / collapsed states based on initial levels
		// settings expanded / collapsed states based on initial levels
		_setInitialLevels: function(nodes, level) {
			if (!nodes) { return; }

app/app-iot-server/src/main/webapp/front/js/lib/plugins/vue/vue.js

@@ -2897,7 +2897,7 @@ function callUpdatedHooks (queue) {
 * The queue will be processed after the entire tree has been patched.
 */
function queueActivatedComponent (vm) {
  // setting _inactive to false here so that a render function can
  // settings _inactive to false here so that a render function can
  // rely on checking whether it's in an inactive tree (e.g. router-view)
  vm._inactive = false;
  activatedChildren.push(vm);
@@ -6070,8 +6070,8 @@ function updateAttrs (oldVnode, vnode) {
      setAttr(elm, key, cur);
    }
  }
  // #4391: in IE9, setting type can reset value for input[type=radio]
  // #6666: IE/Edge forces progress value down to 1 before setting a max
  // #4391: in IE9, settings type can reset value for input[type=radio]
  // #6666: IE/Edge forces progress value down to 1 before settings a max
  /* istanbul ignore if */
  if ((isIE9 || isEdge) && attrs.value !== oldAttrs.value) {
    setAttr(elm, 'value', attrs.value);
@@ -6559,7 +6559,7 @@ function model (
  var type = el.attrsMap.type;
  {
    // inputs with type="file" are read only and setting the input's
    // inputs with type="file" are read only and settings the input's
    // value will throw an error.
    if (tag === 'input' && type === 'file') {
      warn$1(
@@ -7008,7 +7008,7 @@ function updateStyle (oldVnode, vnode) {
  for (name in newStyle) {
    cur = newStyle[name];
    if (cur !== oldStyle[name]) {
      // ie9 setting to null has no effect, must use empty string
      // ie9 settings to null has no effect, must use empty string
      setProp(el, name, cur == null ? '' : cur);
    }
  }

app/public-health-server/src/main/resources/application.yml

@@ -16,7 +16,7 @@ spring:
      max-active: 8 # Max number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1  # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
      min-idle: 1  # Target for the minimum number of idle connections to maintain in the pool. This settings only has an effect if it is positive.
  application:
    name: app-health-server
    message: App IOT Server

app/public-health-server/src/main/webapp/front/js/lib/plugins/dataTables/jquery.dataTables.js

@@ -1178,7 +1178,7 @@
		if ( $.isPlainObject( mSource ) )
		{
			/* Unlike get, only the underscore (global) option is used for for
			 * setting data since we don't know the type here. This is why an object
			 * settings data since we don't know the type here. This is why an object
			 * option is not documented for `mData` (which is read/write), but it is
			 * for `mRender` which is read only.
			 */
@@ -1220,7 +1220,7 @@
						b.splice( 0, i+1 );
						innerSrc = b.join('.');
						// Traverse each entry in the array setting the properties requested
						// Traverse each entry in the array settings the properties requested
						for ( var j=0, jLen=val.length ; j<jLen ; j++ )
						{
							o = {};
@@ -7220,7 +7220,7 @@
				settings.ajax = url;
			}
			// No need to consider sAjaxSource here since DataTables gives priority
			// to `ajax` over `sAjaxSource`. So setting `ajax` here, renders any
			// to `ajax` over `sAjaxSource`. So settings `ajax` here, renders any
			// value of `sAjaxSource` redundant.
		} );
	} );
@@ -7230,7 +7230,7 @@
	 * Load data from the newly set Ajax URL. Note that this method is only
	 * available when `ajax.url()` is used to set a URL. Additionally, this method
	 * has the same effect as calling `ajax.reload()` but is provided for
	 * convenience when setting a new URL. Like `ajax.reload()` it will
	 * convenience when settings a new URL. Like `ajax.reload()` it will
	 * automatically redraw the table once the remote data has been loaded.
	 *
	 * @returns {DataTables.Api} this
@@ -9589,7 +9589,7 @@
		 * table has already been initialised, this parameter will cause DataTables
		 * to simply return the object that has already been set up - it will not take
		 * account of any changes you might have made to the initialisation object
		 * passed to DataTables (setting this parameter to true is an acknowledgement
		 * passed to DataTables (settings this parameter to true is an acknowledgement
		 * that you understand this). `destroy` can be used to reinitialise a table if
		 * you need.
		 *  @type boolean
@@ -9999,7 +9999,7 @@
		/**
		 * This function allows you to 'post process' each row after it have been
		 * generated for each table draw, but before it is rendered on screen. This
		 * function might be used for setting the row class name etc.
		 * function might be used for settings the row class name etc.
		 *  @type function
		 *  @param {node} row "TR" element for the current row
		 *  @param {array} data Raw data array for this row
@@ -10317,7 +10317,7 @@
		/**
		 * Number of rows to display on a single page when using pagination. If
		 * feature enabled (`lengthChange`) then the end user will be able to override
		 * this to a custom setting using a pop-up menu.
		 * this to a custom settings using a pop-up menu.
		 *  @type int
		 *  @default 10
		 *
@@ -11396,7 +11396,7 @@
		 *    * Parameters:
		 *      * `{array|object}` The data source for the row
		 *      * `{string}` The type call data requested - this will be 'set' when
		 *        setting data or 'filter', 'display', 'type', 'sort' or undefined
		 *        settings data or 'filter', 'display', 'type', 'sort' or undefined
		 *        when gathering data. Note that when `undefined` is given for the
		 *        type DataTables expects to get the raw data for the object back<
		 *      * `{*}` Data to set when the second parameter is 'set'.
@@ -12675,7 +12675,7 @@
		 * Server-side processing - number of records in the result set
		 * (i.e. before filtering), Use fnRecordsTotal rather than
		 * this property to get the value of the number of records, regardless of
		 * the server-side processing setting.
		 * the server-side processing settings.
		 *  @type int
		 *  @default 0
		 *  @private
@@ -12686,7 +12686,7 @@
		 * Server-side processing - number of records in the current display set
		 * (i.e. after filtering). Use fnRecordsDisplay rather than
		 * this property to get the value of the number of records, regardless of
		 * the server-side processing setting.
		 * the server-side processing settings.
		 *  @type boolean
		 *  @default 0
		 *  @private

app/public-health-server/src/main/webapp/front/js/lib/plugins/datapicker/bootstrap-datepicker.js

@@ -649,11 +649,11 @@
				this.viewDate = new Date(this.o.endDate);
			if (fromArgs){
				// setting date by clicking
				// settings date by clicking
				this.setValue();
			}
			else if (dates.length){
				// setting date by typing
				// settings date by typing
				if (String(oldDates) !== String(this.dates))
					this._trigger('changeDate');
			}

app/public-health-server/src/main/webapp/front/js/lib/plugins/flot/jquery.flot.js

@@ -63,7 +63,7 @@
                    inverseTransform: null, // if transform is set, this should be the inverse function
                    min: null, // min. value to show, null means set automatically
                    max: null, // max. value to show, null means set automatically
                    autoscaleMargin: null, // margin in % to add if auto-setting min/max
                    autoscaleMargin: null, // margin in % to add if auto-settings min/max
                    ticks: null, // either [1, 3] or [[1, "a"], 3] or (fn: axis info -> ticks) or app. number of ticks for auto-ticks
                    tickFormatter: null, // fn: number -> string
                    labelWidth: null, // size of tick labels in pixels

app/public-health-server/src/main/webapp/front/js/lib/plugins/treeview/bootstrap-treeview.js

@@ -178,7 +178,7 @@
		},
		// On initialization recurses the entire tree structure
		// setting expanded / collapsed states based on initial levels
		// settings expanded / collapsed states based on initial levels
		_setInitialLevels: function(nodes, level) {
			if (!nodes) { return; }

app/public-health-server/src/main/webapp/front/js/lib/plugins/vue/vue.js

@@ -2897,7 +2897,7 @@ function callUpdatedHooks (queue) {
 * The queue will be processed after the entire tree has been patched.
 */
function queueActivatedComponent (vm) {
  // setting _inactive to false here so that a render function can
  // settings _inactive to false here so that a render function can
  // rely on checking whether it's in an inactive tree (e.g. router-view)
  vm._inactive = false;
  activatedChildren.push(vm);
@@ -6070,8 +6070,8 @@ function updateAttrs (oldVnode, vnode) {
      setAttr(elm, key, cur);
    }
  }
  // #4391: in IE9, setting type can reset value for input[type=radio]
  // #6666: IE/Edge forces progress value down to 1 before setting a max
  // #4391: in IE9, settings type can reset value for input[type=radio]
  // #6666: IE/Edge forces progress value down to 1 before settings a max
  /* istanbul ignore if */
  if ((isIE9 || isEdge) && attrs.value !== oldAttrs.value) {
    setAttr(elm, 'value', attrs.value);
@@ -6559,7 +6559,7 @@ function model (
  var type = el.attrsMap.type;
  {
    // inputs with type="file" are read only and setting the input's
    // inputs with type="file" are read only and settings the input's
    // value will throw an error.
    if (tag === 'input' && type === 'file') {
      warn$1(
@@ -7008,7 +7008,7 @@ function updateStyle (oldVnode, vnode) {
  for (name in newStyle) {
    cur = newStyle[name];
    if (cur !== oldStyle[name]) {
      // ie9 setting to null has no effect, must use empty string
      // ie9 settings to null has no effect, must use empty string
      setProp(el, name, cur == null ? '' : cur);
    }
  }

business/base-service/src/main/java/com/yihu/jw/patient/dao/BasePatientMedicareCardDao.java

@@ -11,7 +11,7 @@ import java.util.Set;
/**
 * Created by Trick on 2018/8/31.
 */
public interface BasePatientMedicareCardDao extends PagingAndSortingRepository<PatientMedicareCardDO, String>, JpaSpecificationExecutor<PatientMedicareCardDO> {
public interface BasePatientMedicareCardDao extends PagingAndSortingRepository<PatientMedicareCardDO, Integer>, JpaSpecificationExecutor<PatientMedicareCardDO> {
    List<PatientMedicareCardDO> findByPatientCode(String patientCode);

business/base-service/src/main/java/com/yihu/jw/wechat/dao/WxPayLogDao.java

@@ -0,0 +1,15 @@
package com.yihu.jw.wechat.dao;
import com.yihu.jw.entity.base.wx.WxPayLogDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
public interface WxPayLogDao extends PagingAndSortingRepository<WxPayLogDO, String>, JpaSpecificationExecutor<WxPayLogDO> {
    @Query("from WxPayLogDO a where a.seqNo=?1 order by createTime desc")
    List<WxPayLogDO> findBySeqNo(String seqNo);
}

business/base-service/src/main/java/com/yihu/jw/wechat/service/WechatInfoService.java

@@ -19,22 +19,17 @@ public class WechatInfoService {
     * @param code
     * @return
     */
    public String getOpenidByCode(String code,String appId,String appSecret) {
        try {
            String token_url = "https://api.weixin.qq.com/sns/oauth2/access_token";
            String params = "appid=" + appId + "&secret=" +appSecret+ "&code=" + code + "&grant_type=authorization_code";
            String result = HttpUtil.sendGet(token_url, params);
            System.out.println("getOpenidByCode:"+result);
            JSONObject json = new JSONObject(result);
            if (json.has("openid")) {
                return json.get("openid").toString();
            } else {
                return null;
            }
        } catch (Exception e) {
            e.printStackTrace();
    public String getOpenidByCode(String code,String appId,String appSecret) throws Exception {
        String token_url = "https://api.weixin.qq.com/sns/oauth2/access_token";
        String params = "appid=" + appId + "&secret=" +appSecret+ "&code=" + code + "&grant_type=authorization_code";
        String result = HttpUtil.sendGet(token_url, params);
        System.out.println("getOpenidByCode:"+result);
        JSONObject json = new JSONObject(result);
        if (json.has("openid")) {
            return json.get("openid").toString();
        }else{
            throw new Exception(result);
        }
        return null;
    }
    /**
@@ -43,7 +38,7 @@ public class WechatInfoService {
     * @param code
     * @return
     */
    public String getOpenidByCode(String code,String wxId) {
    public String getOpenidByCode(String code,String wxId) throws Exception {
        //通过wxId获取appId和appSecret
        WxWechatDO wxWechatDO = wechatDao.findById(wxId);
        return getOpenidByCode(code,wxWechatDO.getAppId(),wxWechatDO.getAppSecret());

business/base-service/src/main/java/com/yihu/jw/wechat/service/WxPayLogService.java

@@ -0,0 +1,41 @@
package com.yihu.jw.wechat.service;
import com.yihu.jw.entity.base.wx.WxAccessTokenDO;
import com.yihu.jw.entity.base.wx.WxPayLogDO;
import com.yihu.jw.wechat.dao.WxAccessTokenDao;
import com.yihu.jw.wechat.dao.WxPayLogDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.Map;
@Service
public class WxPayLogService extends BaseJpaService<WxPayLogDO, WxPayLogDao> {
    @Autowired
    private WxPayLogDao wxPayLogDao;
    public void createLog(Map<String,String> map,String orderPar,Map<String,Object> orderRes){
        WxPayLogDO wxPayLogDO = new WxPayLogDO();
        wxPayLogDO.setSeqNo(map.get("out_trade_no"));
        wxPayLogDO.setOpenId(map.get("openid"));
        wxPayLogDO.setType(0);
        wxPayLogDO.setOrderParams(orderPar);
        wxPayLogDO.setOrderResponse(orderRes.get("wxPayResult").toString());
        String return_code = orderRes.get("return_code").toString();
        if("SUCCESS".equalsIgnoreCase(return_code)){
            wxPayLogDO.setOrderStatus(1);
        }else{
            wxPayLogDO.setOrderStatus(-1);
        }
        wxPayLogDO.setCreateTime(new Date());
        wxPayLogDO.setPayStatus(0);
        this.save(wxPayLogDO);
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/HelpCenterDO.java

@@ -39,12 +39,12 @@ public class HelpCenterDO extends IntegerIdentityEntity {
    /**
	 * 有用次数
	 */
	private String usefulCount;
	private Integer usefulCount;
    /**
	 * 无用次数
	 */
	private String unusefulCount;
	private Integer unusefulCount;
	@Column(name = "parent_type")
@@ -80,18 +80,18 @@ public class HelpCenterDO extends IntegerIdentityEntity {
    }
	@Column(name = "useful_count")
    public String getUsefulCount() {
    public Integer getUsefulCount() {
        return usefulCount;
    }
    public void setUsefulCount(String usefulCount) {
    public void setUsefulCount(Integer usefulCount) {
        this.usefulCount = usefulCount;
    }
	@Column(name = "unuseful_count")
    public String getUnusefulCount() {
    public Integer getUnusefulCount() {
        return unusefulCount;
    }
    public void setUnusefulCount(String unusefulCount) {
    public void setUnusefulCount(Integer unusefulCount) {
        this.unusefulCount = unusefulCount;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/PatientMedicareCardDO.java

@@ -98,9 +98,9 @@ public class PatientMedicareCardDO extends IntegerIdentityEntity {
	private String patientCode;
    /**
	 * 绑定密码
	 * 医社保卡缴交的城市
	 */
	private String password;
	private String cityCode;
    /**
	 * 微信openid，有些卡会绑定微信
@@ -155,15 +155,16 @@ public class PatientMedicareCardDO extends IntegerIdentityEntity {
        this.patientCode = patientCode;
    }
	@Column(name = "password")
    public String getPassword() {
        return password;
    @Column(name = "city_code")
    public String getCityCode() {
        return cityCode;
    }
    public void setPassword(String password) {
        this.password = password;
    public void setCityCode(String cityCode) {
        this.cityCode = cityCode;
    }
	@Column(name = "wx_openid")
    @Column(name = "wx_openid")
    public String getWxOpenid() {
        return wxOpenid;
    }

common/common-entity/src/main/java/com/yihu/jw/entity/base/servicePackage/ServicePackageSignRecordDO.java

@@ -36,6 +36,8 @@ public class ServicePackageSignRecordDO extends UuidIdentityEntity implements Se
    private String operator;//签约申请人处理人
    private Date createTime;//创建时间
    private Integer sort;//排序：0 待支付，1未通过，2未通过，3待审核，4.生效
    private String cancelReason;//取消原因
    private String reviewReason;//审核原因
    @Column(name = "saas_id")
    public String getSaasId() {
@@ -207,4 +209,20 @@ public class ServicePackageSignRecordDO extends UuidIdentityEntity implements Se
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public String getCancelReason() {
        return cancelReason;
    }
    public void setCancelReason(String cancelReason) {
        this.cancelReason = cancelReason;
    }
    public String getReviewReason() {
        return reviewReason;
    }
    public void setReviewReason(String reviewReason) {
        this.reviewReason = reviewReason;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/wx/WxPayLogDO.java

@@ -0,0 +1,107 @@
package com.yihu.jw.entity.base.wx;
import com.yihu.jw.entity.IntegerIdentityEntity;
import javax.persistence.Entity;
import javax.persistence.Table;
import java.util.Date;
/**
 * Created by Trick on 2018/11/8.
 */
@Entity(name = "WxPayLogDO")
@Table(name = "wlyy_wx_pay_log")
public class WxPayLogDO extends IntegerIdentityEntity {
    private String seqNo;//支付订单号',
    private String openId;//openid,
    private Integer type;//支付的类型(预留字段) 0:服务包签约
    private String orderParams;//统一下单参数XML',
    private String orderResponse;//统一下单返回XML',
    private Integer orderStatus;//统一下单状态，1为成功。0为默认，-1为失败',
    private String payResponse;//支付回调XML',
    private Date createTime;//'统一下单时间',
    private Date payTime;//支付回调时间',
    private Integer payStatus;//支付回调状态1为成功，0为默认，-1为失败',
    public String getSeqNo() {
        return seqNo;
    }
    public void setSeqNo(String seqNo) {
        this.seqNo = seqNo;
    }
    public String getOpenId() {
        return openId;
    }
    public void setOpenId(String openId) {
        this.openId = openId;
    }
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    public String getOrderParams() {
        return orderParams;
    }
    public void setOrderParams(String orderParams) {
        this.orderParams = orderParams;
    }
    public String getOrderResponse() {
        return orderResponse;
    }
    public void setOrderResponse(String orderResponse) {
        this.orderResponse = orderResponse;
    }
    public Integer getOrderStatus() {
        return orderStatus;
    }
    public void setOrderStatus(Integer orderStatus) {
        this.orderStatus = orderStatus;
    }
    public String getPayResponse() {
        return payResponse;
    }
    public void setPayResponse(String payResponse) {
        this.payResponse = payResponse;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public Date getPayTime() {
        return payTime;
    }
    public void setPayTime(Date payTime) {
        this.payTime = payTime;
    }
    public Integer getPayStatus() {
        return payStatus;
    }
    public void setPayStatus(Integer payStatus) {
        this.payStatus = payStatus;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/wx/WxWechatDO.java

@@ -33,6 +33,9 @@ public class WxWechatDO extends UuidIdentityEntityWithOperator implements java.i
    private String password;//用户密码
    private String publicType;//1.自运营，2.外接
    private String remark;//'备注'
    private String mchId;//商户id
    private String cerfiticate;//商户证书(预留字段,保存证书路径??) 目前暂未使用到
    private String appKey;//appKey
    @Transient
@@ -188,4 +191,31 @@ public class WxWechatDO extends UuidIdentityEntityWithOperator implements java.i
    public void setPublicType(String publicType) {
        this.publicType = publicType;
    }
    @Column(name = "mch_id")
    public String getMchId() {
        return mchId;
    }
    public void setMchId(String mchId) {
        this.mchId = mchId;
    }
    @Column(name = "cerfiticate")
    public String getCerfiticate() {
        return cerfiticate;
    }
    public void setCerfiticate(String cerfiticate) {
        this.cerfiticate = cerfiticate;
    }
    @Column(name="app_key")
    public String getAppKey() {
        return appKey;
    }
    public void setAppKey(String appKey) {
        this.appKey = appKey;
    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -491,6 +491,8 @@ public class BaseRequestMapping {
        public static final String unBindCard  = "/unBindCard";
        public static final String cardList  = "/cardList";
        public static final String cardOrgList  = "/cardOrgList";
        public static final String sortProList  = "/sortProList";
        public static final String sortCityList  = "/sortCityList";
    }
@@ -513,6 +515,8 @@ public class BaseRequestMapping {
     */
    public static class HelpCenter extends Basic {
        public static final String PREFIX  = "/helpCenter";
        public static final String getAnswerByType  = "/getAnswerByType";
        public static final String commentAnswer  = "/commentAnswer";
    }

common/common-request-mapping/src/main/java/com/yihu/jw/rm/patient/PatientRequestMapping.java

@@ -31,6 +31,11 @@ public class PatientRequestMapping {
        public static final String getWxWechatConfig ="/getWxWechatConfig";
    }
    public abstract static class WechatPay extends Basic{
        public static final String PRE_URL =  "/wechatPay";
        public static final String Notify =  "/notify";
    }
    /**
     * signPackage
     */

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/patient/PatientMedicareCardVO.java

@@ -46,10 +46,10 @@ public class PatientMedicareCardVO extends IntegerIdentityVO{
    private String patientCode;
    /**
	 * 绑定密码
	 * 医社保卡缴交的城市
	 */
	@ApiModelProperty(value = "绑定密码", example = "模块1")
    private String password;
	@ApiModelProperty(value = "医社保卡缴交的城市", example = "模块1")
    private String cityCode;
    /**
	 * 微信openid，有些卡会绑定微信
@@ -105,11 +105,12 @@ public class PatientMedicareCardVO extends IntegerIdentityVO{
        this.patientCode = patientCode;
    }
    public String getPassword() {
        return password;
    public String getCityCode() {
        return cityCode;
    }
    public void setPassword(String password) {
        this.password = password;
    public void setCityCode(String cityCode) {
        this.cityCode = cityCode;
    }
    public String getWxOpenid() {

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/patient/signPackage/ServicePackageRecordVO.java

@@ -7,6 +7,7 @@ import java.util.Date;
 */
public class ServicePackageRecordVO {
    private String id;
    private String saasId;
    private String servicePackageId;//服务包id
    private String servicePackageName;//服务包名称
@@ -27,10 +28,19 @@ public class ServicePackageRecordVO {
    private String operator;//签约申请人处理人
    private Date createTime;//创建时间
    private Integer sort;//排序：0 待支付，1未通过，2未通过，3待审核，4.生效
    private String cancelReason;//取消原因
    private String reviewReason;//审核原因
    private String introduce;//服务介绍
    private String endIntroduce;//过期时间说明
    public String getId() {
        return id;
    }
    public void setId(String id) {
        this.id = id;
    }
    public String getSaasId() {
        return saasId;
    }
@@ -206,4 +216,20 @@ public class ServicePackageRecordVO {
    public void setEndIntroduce(String endIntroduce) {
        this.endIntroduce = endIntroduce;
    }
    public String getCancelReason() {
        return cancelReason;
    }
    public void setCancelReason(String cancelReason) {
        this.cancelReason = cancelReason;
    }
    public String getReviewReason() {
        return reviewReason;
    }
    public void setReviewReason(String reviewReason) {
        this.reviewReason = reviewReason;
    }
}

common/common-util/src/main/java/com/yihu/jw/util/wechat/WeiXinPayUtils.java

@@ -16,6 +16,31 @@ public class WeiXinPayUtils {
    private static final Random RANDOM = new SecureRandom();
    /**
     * 获取 微信支付,统一下单 前的报文
     * @param param
     * @param appKey
     * @return
     * @throws Exception
     */
    public static String getXmlBeforUnifiedorder(Map<String, String> param,String appKey) throws Exception {
        synchronized (WeiXinPayUtils.class) {
            param.put("nonce_str",generateNonceStr());
            WXPayConstants.SignType  wxSignType = WXPayConstants.SignType.MD5;
            String signType = param.get("sign_type");
            if("HMAC-SHA256".equalsIgnoreCase(signType)){
                wxSignType = WXPayConstants.SignType.HMACSHA256;
            }
            //获取微信签名
            String signature = WeiXinPayUtils.generateSignature(param, appKey, wxSignType);
            param.put("sign",signature);
            //参数转化XML
            String params = XMLUtil.map2xmlForWx(param);
            return params;
        }
    }
    /**
     *
@@ -25,26 +50,49 @@ public class WeiXinPayUtils {
     *
     * @param param
     * @param appKey
     * @return
     * @return  返回的map为微信返回报文转换成的map,
     *            此外map中 有个属性 wxPayResult.该属性放着微信返回的原始报文数据
     * @throws Exception
     */
    public static Map<String,Object> unifiedorder(Map<String, String> param,String appKey) throws Exception {
        param.put("nonce_str",generateNonceStr());
        WXPayConstants.SignType  wxSignType = WXPayConstants.SignType.MD5;
        String signType = param.get("sign_type");
        if("HMAC-SHA256".equalsIgnoreCase(signType)){
            wxSignType = WXPayConstants.SignType.HMACSHA256;
        synchronized (WeiXinPayUtils.class) {
            String xml = getXmlBeforUnifiedorder(param, appKey);
            String result = HttpUtil.sendPost("https://api.mch.weixin.qq.com/pay/unifiedorder", xml);
            Map<String,Object> wxrs =  XMLUtil.xmltoMap(result);
            wxrs.put("wxPayResult",wxrs);
            return wxrs;
        }
    }
        //获取微信签名
        String signature = WeiXinPayUtils.generateSignature(param, appKey, wxSignType);
        param.put("sign",signature);
    /**
     *
     * 微信支付,统一下单
     *
     * param 对应的key值参见文档 https://pay.weixin.qq.com/wiki/doc/api/app/app.php?chapter=9_1 (sign,nonce_str两个参数,此接口会自动生成)
     *
     * @param param
     * @return  返回的map为微信返回报文转换成的map,
     *            此外map中 有个属性 wxPayResult.该属性放着微信返回的原始报文数据
     * @throws Exception
     */
    public static Map<String,Object> unifiedorder(String param) throws Exception {
        synchronized (WeiXinPayUtils.class) {
            String result = HttpUtil.sendPost("https://api.mch.weixin.qq.com/pay/unifiedorder", param);
            Map<String,Object> wxrs =  XMLUtil.xmltoMap(result);
            wxrs.put("wxPayResult",wxrs);
            return wxrs;
        }
    }
        //参数转化XML
        String params = XMLUtil.map2xmlForWx(param);
        String result = HttpUtil.sendPost("https://api.mch.weixin.qq.com/pay/unifiedorder", params);
        Map<String,Object> wxrs =  XMLUtil.xmltoMap(result);
        return wxrs;
    public static Map<String,Object> unifiedorder(String param,boolean withResult) throws Exception {
        synchronized (WeiXinPayUtils.class) {
            String result = HttpUtil.sendPost("https://api.mch.weixin.qq.com/pay/unifiedorder", param);
            Map<String,Object> wxrs =  XMLUtil.xmltoMap(result);
            if(withResult){
                wxrs.put("wxPayResult",wxrs);
            }
            return wxrs;
        }
    }

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/BasicZuulFilter.java

@@ -62,7 +62,9 @@ public class BasicZuulFilter extends ZuulFilter {
        logger.info("BasicZuulFilter:"+url);
        //内部微服务有不需要认证的地址请在URL上追加/open/来进行过滤，如/api/v1.0/open/**，不要在此继续追加！！！
        if (url.contains("/auth/")//验证服务
                || url.contains("/wechat")//微信
                || url.contains("/base/wechat/")//微信
                || url.contains("/patient/wxBase/")//微信
                || url.contains("/patient/wx/")//微信页面不拦截
                || url.contains("/open/")) {//开发接口
            return true;
        }

gateway/ag-basic/src/main/resources/application.yml

@@ -26,7 +26,7 @@ spring:
      max-active: 8 # Max number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This settings only has an effect if it is positive.
#  sleuth:
#    sampler:

server/svr-authentication/src/main/resources/application.yml

@@ -16,7 +16,7 @@ spring:
      max-active: 8 # Max number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This settings only has an effect if it is positive.
#logging:
#  level:

svr/svr-manage/src/main/resources/application.yml

@@ -36,7 +36,7 @@ spring:
      max-active: 8 # Max number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This settings only has an effect if it is positive.
cache: 2

svr/svr-manage/src/main/resources/webapp/common/js/jquery/jquery.form.3.51.0.js

@@ -521,7 +521,7 @@
                    form.setAttribute('action', s.url);
                }
                // ie borks in some cases when setting encoding
                // ie borks in some cases when settings encoding
                if (! s.skipEncodingOverride && (!method || /post/i.test(method))) {
                    $form.attr({
                        encoding: 'multipart/form-data',

svr/svr-manage/src/main/resources/webapp/common/js/plugins/dataTables/jquery.dataTables.js

@@ -1178,7 +1178,7 @@
		if ( $.isPlainObject( mSource ) )
		{
			/* Unlike get, only the underscore (global) option is used for for
			 * setting data since we don't know the type here. This is why an object
			 * settings data since we don't know the type here. This is why an object
			 * option is not documented for `mData` (which is read/write), but it is
			 * for `mRender` which is read only.
			 */
@@ -1220,7 +1220,7 @@
						b.splice( 0, i+1 );
						innerSrc = b.join('.');
	
						// Traverse each entry in the array setting the properties requested
						// Traverse each entry in the array settings the properties requested
						for ( var j=0, jLen=val.length ; j<jLen ; j++ )
						{
							o = {};
@@ -7227,7 +7227,7 @@
				settings.ajax = url;
			}
			// No need to consider sAjaxSource here since DataTables gives priority
			// to `ajax` over `sAjaxSource`. So setting `ajax` here, renders any
			// to `ajax` over `sAjaxSource`. So settings `ajax` here, renders any
			// value of `sAjaxSource` redundant.
		} );
	} );
@@ -7237,7 +7237,7 @@
	 * Load data from the newly set Ajax URL. Note that this method is only
	 * available when `ajax.url()` is used to set a URL. Additionally, this method
	 * has the same effect as calling `ajax.reload()` but is provided for
	 * convenience when setting a new URL. Like `ajax.reload()` it will
	 * convenience when settings a new URL. Like `ajax.reload()` it will
	 * automatically redraw the table once the remote data has been loaded.
	 *
	 * @returns {DataTables.Api} this
@@ -9596,7 +9596,7 @@
		 * table has already been initialised, this parameter will cause DataTables
		 * to simply return the object that has already been set up - it will not take
		 * account of any changes you might have made to the initialisation object
		 * passed to DataTables (setting this parameter to true is an acknowledgement
		 * passed to DataTables (settings this parameter to true is an acknowledgement
		 * that you understand this). `destroy` can be used to reinitialise a table if
		 * you need.
		 *  @type boolean
@@ -10006,7 +10006,7 @@
		/**
		 * This function allows you to 'post process' each row after it have been
		 * generated for each table draw, but before it is rendered on screen. This
		 * function might be used for setting the row class name etc.
		 * function might be used for settings the row class name etc.
		 *  @type function
		 *  @param {node} row "TR" element for the current row
		 *  @param {array} data Raw data array for this row
@@ -10324,7 +10324,7 @@
		/**
		 * Number of rows to display on a single page when using pagination. If
		 * feature enabled (`lengthChange`) then the end user will be able to override
		 * this to a custom setting using a pop-up menu.
		 * this to a custom settings using a pop-up menu.
		 *  @type int
		 *  @default 10
		 *
@@ -11403,7 +11403,7 @@
		 *    * Parameters:
		 *      * `{array|object}` The data source for the row
		 *      * `{string}` The type call data requested - this will be 'set' when
		 *        setting data or 'filter', 'display', 'type', 'sort' or undefined
		 *        settings data or 'filter', 'display', 'type', 'sort' or undefined
		 *        when gathering data. Note that when `undefined` is given for the
		 *        type DataTables expects to get the raw data for the object back<
		 *      * `{*}` Data to set when the second parameter is 'set'.
@@ -12682,7 +12682,7 @@
		 * Server-side processing - number of records in the result set
		 * (i.e. before filtering), Use fnRecordsTotal rather than
		 * this property to get the value of the number of records, regardless of
		 * the server-side processing setting.
		 * the server-side processing settings.
		 *  @type int
		 *  @default 0
		 *  @private
@@ -12693,7 +12693,7 @@
		 * Server-side processing - number of records in the current display set
		 * (i.e. after filtering). Use fnRecordsDisplay rather than
		 * this property to get the value of the number of records, regardless of
		 * the server-side processing setting.
		 * the server-side processing settings.
		 *  @type boolean
		 *  @default 0
		 *  @private

svr/svr-manage/src/main/resources/webapp/common/js/plugins/datapicker/bootstrap-datepicker.js

@@ -649,11 +649,11 @@
				this.viewDate = new Date(this.o.endDate);
			if (fromArgs){
				// setting date by clicking
				// settings date by clicking
				this.setValue();
			}
			else if (dates.length){
				// setting date by typing
				// settings date by typing
				if (String(oldDates) !== String(this.dates))
					this._trigger('changeDate');
			}

svr/svr-manage/src/main/resources/webapp/common/js/plugins/flot/jquery.flot.js

@@ -63,7 +63,7 @@
                    inverseTransform: null, // if transform is set, this should be the inverse function
                    min: null, // min. value to show, null means set automatically
                    max: null, // max. value to show, null means set automatically
                    autoscaleMargin: null, // margin in % to add if auto-setting min/max
                    autoscaleMargin: null, // margin in % to add if auto-settings min/max
                    ticks: null, // either [1, 3] or [[1, "a"], 3] or (fn: axis info -> ticks) or app. number of ticks for auto-ticks
                    tickFormatter: null, // fn: number -> string
                    labelWidth: null, // size of tick labels in pixels

svr/svr-manage/src/main/resources/webapp/common/js/plugins/treeview/bootstrap-treeview.js

@@ -178,7 +178,7 @@
		},
		// On initialization recurses the entire tree structure 
		// setting expanded / collapsed states based on initial levels
		// settings expanded / collapsed states based on initial levels
		_setInitialLevels: function(nodes, level) {
			if (!nodes) { return; }

svr/svr-manage/src/main/resources/webapp/common/js/vue.js

@@ -280,7 +280,7 @@ return /******/ (function(modules) { // webpackBootstrap
	/**
	 * Check and convert possible numeric strings to numbers
	 * before setting back to data
	 * before settings back to data
	 *
	 * @param {*} value
	 * @return {*|Number}
@@ -3386,7 +3386,7 @@ return /******/ (function(modules) { // webpackBootstrap
	/**
	 * 1. Deal with Safari cloning nested <template> bug by
	 *    manually cloning all template instances.
	 * 2. Deal with IE10/11 textarea placeholder bug by setting
	 * 2. Deal with IE10/11 textarea placeholder bug by settings
	 *    the correct value after cloning.
	 *
	 * @param {Element|DocumentFragment} node
@@ -6819,14 +6819,14 @@ return /******/ (function(modules) { // webpackBootstrap
	}
	/**
	 * Warn against setting non-existent root path on a vm.
	 * Warn against settings non-existent root path on a vm.
	 */
	var warnNonExistent
	if (true) {
	  warnNonExistent = function (path) {
	    _.warn(
	      'You are setting a non-existent path "' + path.raw + '" ' +
	      'You are settings a non-existent path "' + path.raw + '" ' +
	      'on a vm instance. Consider pre-initializing the property ' +
	      'with the "data" option for more reliable reactivity ' +
	      'and better performance.'

svr/svr-manage/src/main/resources/webapp/common/js/vue/vue.js

@@ -2667,7 +2667,7 @@ function callUpdateHooks (queue) {
 * The queue will be processed after the entire tree has been patched.
 */
function queueActivatedComponent (vm) {
  // setting _inactive to false here so that a render function can
  // settings _inactive to false here so that a render function can
  // rely on checking whether it's in an inactive tree (e.g. router-view)
  vm._inactive = false;
  activatedChildren.push(vm);
@@ -5511,7 +5511,7 @@ function updateAttrs (oldVnode, vnode) {
      setAttr(elm, key, cur);
    }
  }
  // #4391: in IE9, setting type can reset value for input[type=radio]
  // #4391: in IE9, settings type can reset value for input[type=radio]
  /* istanbul ignore if */
  if (isIE9 && attrs.value !== oldAttrs.value) {
    setAttr(elm, 'value', attrs.value);
@@ -5981,7 +5981,7 @@ function model (
        "v-model does not support dynamic input types. Use v-if branches instead."
      );
    }
    // inputs with type="file" are read only and setting the input's
    // inputs with type="file" are read only and settings the input's
    // value will throw an error.
    if (tag === 'input' && type === 'file') {
      warn$1(
@@ -6420,7 +6420,7 @@ function updateStyle (oldVnode, vnode) {
  for (name in newStyle) {
    cur = newStyle[name];
    if (cur !== oldStyle[name]) {
      // ie9 setting to null has no effect, must use empty string
      // ie9 settings to null has no effect, must use empty string
      setProp(el, name, cur == null ? '' : cur);
    }
  }

svr/svr-manage/src/main/resources/webapp/hplus/js/plugins/dataTables/jquery.dataTables.js

@@ -1178,7 +1178,7 @@
		if ( $.isPlainObject( mSource ) )
		{
			/* Unlike get, only the underscore (global) option is used for for
			 * setting data since we don't know the type here. This is why an object
			 * settings data since we don't know the type here. This is why an object
			 * option is not documented for `mData` (which is read/write), but it is
			 * for `mRender` which is read only.
			 */
@@ -1220,7 +1220,7 @@
						b.splice( 0, i+1 );
						innerSrc = b.join('.');
	
						// Traverse each entry in the array setting the properties requested
						// Traverse each entry in the array settings the properties requested
						for ( var j=0, jLen=val.length ; j<jLen ; j++ )
						{
							o = {};
@@ -7220,7 +7220,7 @@
				settings.ajax = url;
			}
			// No need to consider sAjaxSource here since DataTables gives priority
			// to `ajax` over `sAjaxSource`. So setting `ajax` here, renders any
			// to `ajax` over `sAjaxSource`. So settings `ajax` here, renders any
			// value of `sAjaxSource` redundant.
		} );
	} );
@@ -7230,7 +7230,7 @@
	 * Load data from the newly set Ajax URL. Note that this method is only
	 * available when `ajax.url()` is used to set a URL. Additionally, this method
	 * has the same effect as calling `ajax.reload()` but is provided for
	 * convenience when setting a new URL. Like `ajax.reload()` it will
	 * convenience when settings a new URL. Like `ajax.reload()` it will
	 * automatically redraw the table once the remote data has been loaded.
	 *
	 * @returns {DataTables.Api} this
@@ -9589,7 +9589,7 @@
		 * table has already been initialised, this parameter will cause DataTables
		 * to simply return the object that has already been set up - it will not take
		 * account of any changes you might have made to the initialisation object
		 * passed to DataTables (setting this parameter to true is an acknowledgement
		 * passed to DataTables (settings this parameter to true is an acknowledgement
		 * that you understand this). `destroy` can be used to reinitialise a table if
		 * you need.
		 *  @type boolean
@@ -9999,7 +9999,7 @@
		/**
		 * This function allows you to 'post process' each row after it have been
		 * generated for each table draw, but before it is rendered on screen. This
		 * function might be used for setting the row class name etc.
		 * function might be used for settings the row class name etc.
		 *  @type function
		 *  @param {node} row "TR" element for the current row
		 *  @param {array} data Raw data array for this row
@@ -10317,7 +10317,7 @@
		/**
		 * Number of rows to display on a single page when using pagination. If
		 * feature enabled (`lengthChange`) then the end user will be able to override
		 * this to a custom setting using a pop-up menu.
		 * this to a custom settings using a pop-up menu.
		 *  @type int
		 *  @default 10
		 *
@@ -11396,7 +11396,7 @@
		 *    * Parameters:
		 *      * `{array|object}` The data source for the row
		 *      * `{string}` The type call data requested - this will be 'set' when
		 *        setting data or 'filter', 'display', 'type', 'sort' or undefined
		 *        settings data or 'filter', 'display', 'type', 'sort' or undefined
		 *        when gathering data. Note that when `undefined` is given for the
		 *        type DataTables expects to get the raw data for the object back<
		 *      * `{*}` Data to set when the second parameter is 'set'.
@@ -12675,7 +12675,7 @@
		 * Server-side processing - number of records in the result set
		 * (i.e. before filtering), Use fnRecordsTotal rather than
		 * this property to get the value of the number of records, regardless of
		 * the server-side processing setting.
		 * the server-side processing settings.
		 *  @type int
		 *  @default 0
		 *  @private
@@ -12686,7 +12686,7 @@
		 * Server-side processing - number of records in the current display set
		 * (i.e. after filtering). Use fnRecordsDisplay rather than
		 * this property to get the value of the number of records, regardless of
		 * the server-side processing setting.
		 * the server-side processing settings.
		 *  @type boolean
		 *  @default 0
		 *  @private

svr/svr-manage/src/main/resources/webapp/hplus/js/plugins/datapicker/bootstrap-datepicker.js

@@ -649,11 +649,11 @@
				this.viewDate = new Date(this.o.endDate);
			if (fromArgs){
				// setting date by clicking
				// settings date by clicking
				this.setValue();
			}
			else if (dates.length){
				// setting date by typing
				// settings date by typing
				if (String(oldDates) !== String(this.dates))
					this._trigger('changeDate');
			}

svr/svr-manage/src/main/resources/webapp/hplus/js/plugins/flot/jquery.flot.js

@@ -63,7 +63,7 @@
                    inverseTransform: null, // if transform is set, this should be the inverse function
                    min: null, // min. value to show, null means set automatically
                    max: null, // max. value to show, null means set automatically
                    autoscaleMargin: null, // margin in % to add if auto-setting min/max
                    autoscaleMargin: null, // margin in % to add if auto-settings min/max
                    ticks: null, // either [1, 3] or [[1, "a"], 3] or (fn: axis info -> ticks) or app. number of ticks for auto-ticks
                    tickFormatter: null, // fn: number -> string
                    labelWidth: null, // size of tick labels in pixels

svr/svr-manage/src/main/resources/webapp/hplus/js/plugins/treeview/bootstrap-treeview.js

@@ -178,7 +178,7 @@
		},
		// On initialization recurses the entire tree structure 
		// setting expanded / collapsed states based on initial levels
		// settings expanded / collapsed states based on initial levels
		_setInitialLevels: function(nodes, level) {
			if (!nodes) { return; }

svr/svr-patient/src/main/java/com/yihu/jw/patient/dao/settings/HelpCenterDao.java

@@ -4,6 +4,8 @@ import com.yihu.jw.entity.base.patient.HelpCenterDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * 
@@ -18,4 +20,9 @@ import org.springframework.data.repository.PagingAndSortingRepository;
 * @since 1.
 */
public interface HelpCenterDao extends PagingAndSortingRepository<HelpCenterDO, Integer>, JpaSpecificationExecutor<HelpCenterDO>  {
    List<HelpCenterDO> findByParentType(String parentType);
    HelpCenterDO findByParentTypeAndType(String parentType,String type);
}

svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/personal_info/PatientMedicareCardEndpoint.java

@@ -1,6 +1,7 @@
package com.yihu.jw.patient.endpoint.personal_info;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.base.patient.PatientMedicareCardDO;
import com.yihu.jw.patient.service.personal_Info.PatientMedicareCardService;
import com.yihu.jw.restmodel.base.patient.PatientMedicareCardVO;
@@ -42,8 +43,9 @@ public class PatientMedicareCardEndpoint extends EnvelopRestEndpoint {
    public Envelop bindMedicareCard(
            @ApiParam(name = "id", value = "居民id", required = true) @RequestParam String id,
            @ApiParam(name = "idcard", value = "居民身份证号", required = true) @RequestParam String idcard,
            @ApiParam(name = "cardNumber", value = "医保卡号", required = true) @RequestParam String cardNumber) throws Exception {
        patientMedicareCardService.bindMedicareCard(id,idcard,cardNumber);
            @ApiParam(name = "cardNumber", value = "医保卡号", required = true) @RequestParam String cardNumber,
            @ApiParam(name = "cityCode", value = "城市code", required = true) @RequestParam String cityCode) throws Exception {
        patientMedicareCardService.bindMedicareCard(id,idcard,cardNumber,cityCode);
        return success("success");
    }
@@ -71,7 +73,7 @@ public class PatientMedicareCardEndpoint extends EnvelopRestEndpoint {
    @PostMapping(value = BaseRequestMapping.PatientMedicareCard.unBindCard)
    @ApiOperation(value = "解除绑定卡")
    public Envelop unBindCard(
            @ApiParam(name = "cardId", value = "卡片id", required = true) @RequestParam String cardId) throws Exception {
            @ApiParam(name = "cardId", value = "卡片id", required = true) @RequestParam Integer cardId) throws Exception {
        patientMedicareCardService.unBindCard(cardId);
        return success("success");
    }
@@ -128,10 +130,25 @@ public class PatientMedicareCardEndpoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseRequestMapping.PatientMedicareCard.cardOrgList)
    @ApiOperation(value = "获取可绑定卡的医院字母A-Z排序")
    public ListEnvelop cardOrglist(@ApiParam(name = "id", value = "居民id")
                                   @RequestParam(value = "id", required = false) String saasid) throws Exception {
        List cards = patientMedicareCardService.queryCardOrgSortedList(saasid);
        return success(cards);
    public Envelop cardOrglist(@ApiParam(name = "saasid", value = "租户id")
                                   @RequestParam(value = "saasid", required = false) String saasid) throws Exception {
        JSONObject orgObj = patientMedicareCardService.queryOrgSortedList(saasid);
        return success(orgObj);
    }
    @GetMapping(value = BaseRequestMapping.PatientMedicareCard.sortProList)
    @ApiOperation(value = "获取省份字母A-Z排序")
    public Envelop sortProvincelist() throws Exception {
        JSONObject orgObj = patientMedicareCardService.queryProvinceSortedList();
        return success(orgObj);
    }
    @GetMapping(value = BaseRequestMapping.PatientMedicareCard.sortCityList)
    @ApiOperation(value = "获取（某省份下）城市字母A-Z排序，不传省份取所有城市")
    public Envelop sortCitylist(@ApiParam(name = "provinceCode", value = "省份代码")
                                   @RequestParam(value = "provinceCode", required = false) String provinceCode) throws Exception {
        JSONObject orgObj = patientMedicareCardService.queryCitySortedList(provinceCode);
        return success(orgObj);
    }
}

svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/settings/HelpCenterEndpoint.java

@@ -14,64 +14,63 @@ import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
* 帮助中心控制器
*
* @version
* <pre>
 * 帮助中心控制器
 *
 * @version <pre>
 * Author	Version		Date		Changes
 * Administrator 	1.0  		2018年11月27日 	Created
 *
 * </pre>
* @since 1.
*/
 * @since 1.
 */
@RestController
@RequestMapping(value = BaseRequestMapping.HelpCenter.PREFIX)
@Api(value = "帮助中心管理", description = "帮助中心管理服务接口", tags = {"帮助中心管理服务接口"})
public class HelpCenterEndpoint extends EnvelopRestEndpoint {
@Autowired
private HelpCenterService helpCenterService;
    @Autowired
    private HelpCenterService helpCenterService;
@PostMapping(value = BaseRequestMapping.HelpCenter.CREATE)
@ApiOperation(value = "创建")
public ObjEnvelop<HelpCenterVO> create (
    @ApiParam(name = "jsonData", value = "Json数据", required = true)
    @RequestParam String jsonData) throws Exception {
    HelpCenterDO helpCenter = toEntity(jsonData, HelpCenterDO.class);
    helpCenter = helpCenterService.save(helpCenter);
    return success(helpCenter, HelpCenterVO.class);
    @PostMapping(value = BaseRequestMapping.HelpCenter.CREATE)
    @ApiOperation(value = "创建")
    public ObjEnvelop<HelpCenterVO> create(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        HelpCenterDO helpCenter = toEntity(jsonData, HelpCenterDO.class);
        helpCenter = helpCenterService.save(helpCenter);
        return success(helpCenter, HelpCenterVO.class);
    }
    @PostMapping(value = BaseRequestMapping.HelpCenter.DELETE)
    @ApiOperation(value = "删除")
    public Envelop delete(
    @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
    @RequestParam(value = "ids") String ids) {
    helpCenterService.delete(ids.split(","));
    return success("删除成功");
            @ApiParam(name = "ids", value = "id串，中间用,分隔", required = true)
            @RequestParam(value = "ids") String ids) {
        helpCenterService.delete(ids.split(","));
        return success("删除成功");
    }
    @PostMapping(value = BaseRequestMapping.HelpCenter.UPDATE)
    @ApiOperation(value = "更新")
    public ObjEnvelop<HelpCenterVO> update (
        @ApiParam(name = "jsonData", value = "Json数据", required = true)
        @RequestParam String jsonData) throws Exception {
    public ObjEnvelop<HelpCenterVO> update(
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) throws Exception {
        HelpCenterDO helpCenter = toEntity(jsonData, HelpCenterDO.class);
        if (null == helpCenter.getId()) {
        return failed("ID不能为空", ObjEnvelop.class);
            return failed("ID不能为空", ObjEnvelop.class);
        }
        helpCenter = helpCenterService.save(helpCenter);
        return success(helpCenter, HelpCenterVO.class);
        }
    }
        @GetMapping(value = BaseRequestMapping.HelpCenter.PAGE)
        @ApiOperation(value = "获取分页")
        public PageEnvelop<HelpCenterVO> page (
    @GetMapping(value = BaseRequestMapping.HelpCenter.PAGE)
    @ApiOperation(value = "获取分页")
    public PageEnvelop<HelpCenterVO> page(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -82,22 +81,42 @@ public ObjEnvelop<HelpCenterVO> create (
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
            List<HelpCenterDO> helpCenters = helpCenterService.search(fields, filters, sorts, page, size);
                int count = (int)helpCenterService.getCount(filters);
                return success(helpCenters, count, page, size, HelpCenterVO.class);
         }
        List<HelpCenterDO> helpCenters = helpCenterService.search(fields, filters, sorts, page, size);
        int count = (int) helpCenterService.getCount(filters);
        return success(helpCenters, count, page, size, HelpCenterVO.class);
    }
    @GetMapping(value = BaseRequestMapping.HelpCenter.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<HelpCenterVO> list(
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
            @RequestParam(value = "filters", required = false) String filters,
            @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        List<HelpCenterDO> helpCenters = helpCenterService.search(fields, filters, sorts);
        return success(helpCenters, HelpCenterVO.class);
    }
    @GetMapping(value = BaseRequestMapping.HelpCenter.getAnswerByType)
    @ApiOperation(value = "获取答案")
    public ListEnvelop getAnswerByType(
            @ApiParam(name = "parentType", value = "问题大类，（大类小类均为空取默认所有大类问题描述列表）")
            @RequestParam(value = "parentType", required = false) String parentType,
            @ApiParam(name = "type", value = "问题小类")
            @RequestParam(value = "type", required = false) String type) throws Exception {
        return success(helpCenterService.getAnswerByType(parentType, type));
    }
         @GetMapping(value = BaseRequestMapping.HelpCenter.LIST)
         @ApiOperation(value = "获取列表")
         public ListEnvelop<HelpCenterVO> list (
             @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
             @RequestParam(value = "fields", required = false) String fields,
             @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
             @RequestParam(value = "filters", required = false) String filters,
             @ApiParam(name = "sorts", value = "排序，规则参见说明文档")
             @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
             List<HelpCenterDO> helpCenters = helpCenterService.search(fields, filters, sorts);
                  return success(helpCenters, HelpCenterVO.class);
         }
    @GetMapping(value = BaseRequestMapping.HelpCenter.commentAnswer)
    @ApiOperation(value = "反馈问题答案")
    public Envelop commentAnswer(
            @ApiParam(name = "questionId", value = "问题id")
            @RequestParam(value = "questionId", required = true) int questionId,
            @ApiParam(name = "usefulOrNot", value = "是否有用，true-有用，false-无用")
            @RequestParam(value = "usefulOrNot", required = true) boolean usefulOrNot) throws Exception {
        return success(helpCenterService.commentAnswer(questionId, usefulOrNot));
    }
 }
}

svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/wechat/WechatInfoEndPoint.java

@@ -70,21 +70,19 @@ public class WechatInfoEndPoint extends EnvelopRestEndpoint {
                           @RequestParam(value = "wxId", required = true)String wxId) {
        String ticket = getJsapi_ticketByToken(wxId);
            Map<Object, Object> map = new HashMap<Object, Object>();
            if (ticket != null) {
                String noncestr = UUID.randomUUID().toString();
                long timestamp = System.currentTimeMillis() / 1000;
                String url = pageUrl;
                String str = "jsapi_ticket=" + ticket + "&noncestr=" + noncestr + "&timestamp=" + timestamp + "&url=" + url;
                // sha1加密
                String signature = SHA1(str);
                map.put("noncestr", noncestr);
                map.put("timestamp", timestamp);
                map.put("signature", signature);
                return success(PatientRequestMapping.Wechat.api_success,map);
            }
        Map<Object, Object> map = new HashMap<Object, Object>();
        if (ticket != null) {
            String noncestr = UUID.randomUUID().toString();
            long timestamp = System.currentTimeMillis() / 1000;
            String url = pageUrl;
            String str = "jsapi_ticket=" + ticket + "&noncestr=" + noncestr + "&timestamp=" + timestamp + "&url=" + url;
            // sha1加密
            String signature = SHA1(str);
            map.put("noncestr", noncestr);
            map.put("timestamp", timestamp);
            map.put("signature", signature);
            return success(PatientRequestMapping.Wechat.api_success,map);
        }
        return failed(PatientRequestMapping.Wechat.api_error);
    }
@@ -97,8 +95,9 @@ public class WechatInfoEndPoint extends EnvelopRestEndpoint {
     */
    @RequestMapping(value = "getOpenidByCode", method = {RequestMethod.POST, RequestMethod.GET})
    @ResponseBody
    public String getOpenidByCode(String code) {
        return wechatInfoService.getOpenidByCode(code,wxId);
    public Envelop getOpenidByCode(String code) throws Exception {
        String openid = wechatInfoService.getOpenidByCode(code, wxId);
        return success(PatientRequestMapping.Wechat.api_success,openid);
    }
    /**

svr/svr-patient/src/main/java/com/yihu/jw/patient/endpoint/wechat/WechatPayController.java

@@ -0,0 +1,68 @@
package com.yihu.jw.patient.endpoint.wechat;
import com.yihu.jw.patient.service.wechat.WechatPayService;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.patient.PatientRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Map;
@Controller
@RequestMapping(value = PatientRequestMapping.WechatPay.PRE_URL)
@Api(value = "微信支付等相关接口", description = "微信支付等相关接口", tags = {"居民端 - 微信支付等相关接口"})
public class WechatPayController extends EnvelopRestEndpoint {
    @Autowired
    private WechatPayService wechatPayService;
    @Value("${wechat.id}")
    private String wxId;
    @ApiOperation("服务包下单")
    @RequestMapping(value = "createPayOrder", method = RequestMethod.POST)
    @ResponseBody
    public Map<String, Object> unifiedorder(
                             @ApiParam(name = "wechatId", value = "wechatId", required = false)
                             @RequestParam(required = false)String wechatId,
                             @ApiParam(name = "openid", value = "openid", required = true)
                             @RequestParam(required = true)String openid,
                             @ApiParam(name = "ip", value = "终端IP（患者）", required = true)
                             @RequestParam(required = true)String ip,
                             @ApiParam(name = "orderId", value = "订单号[base_service_package_sign_record 的id字段用作与订单id]", required = true)
                             @RequestParam(required = true)String orderId) throws Exception {
        if(StringUtils.isNotBlank(wechatId)){
            wxId = wechatId;
        }
        return wechatPayService.unifiedorder(wxId, openid, ip, orderId);
    }
    @ResponseBody
    @ApiOperation("微信支付结果通知")
    @RequestMapping(value = PatientRequestMapping.WechatPay.Notify, method = {RequestMethod.GET, RequestMethod.POST})
    public Map<String, String> wxPayNotify(HttpServletRequest request, HttpServletResponse response) throws IOException {
        String result = "";
        String inputLine;
        while ((inputLine = request.getReader().readLine()) != null) {
            result += inputLine;
        }
        request.getReader().close();
        Map<String, String> map = wechatPayService.getWxPayResultNotify(result);
        return map;
    }
}

svr/svr-patient/src/main/java/com/yihu/jw/patient/exception/settings/HelpCenterQesNotFoundException.java

@@ -0,0 +1,11 @@
package com.yihu.jw.patient.exception.settings;
/**
 * 帮助中心-《找不到问题》异常
 */
public class HelpCenterQesNotFoundException extends RuntimeException{
    public HelpCenterQesNotFoundException(String msg){
        super(msg);
    }
}

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/personal_Info/PatientMedicareCardService.java

@@ -1,5 +1,7 @@
package com.yihu.jw.patient.service.personal_Info;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.base.patient.PatientMedicareCardDO;
import com.yihu.jw.exception.business.patient.PatientCardNotFoundException;
import com.yihu.jw.exception.business.patient.PatientNotFoundException;
@@ -7,15 +9,18 @@ import com.yihu.jw.patient.dao.BasePatientMedicareCardDao;
import com.yihu.jw.patient.service.BasePatientMedicardCardService;
import com.yihu.jw.patient.util.JavaBeanUtils;
import com.yihu.jw.patient.util.PinYinUtil;
import netscape.javascript.JSObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import javax.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -45,13 +50,15 @@ public class PatientMedicareCardService extends BasePatientMedicardCardService<P
     * @param medicareCardNumber
     */
    @Transactional(rollbackFor = Exception.class)
    public void bindMedicareCard(String patientCode, String idcard,String medicareCardNumber) {
    public void bindMedicareCard(String patientCode, String idcard,String medicareCardNumber,String cityCode) {
        Assert.notNull(patientCode,"居民code不可为空！");
        Assert.notNull(idcard,"身份证号不可为空！");
        Assert.notNull(medicareCardNumber,"医(社)保卡号不可为空！");
        Assert.notNull(medicareCardNumber,"城市code不可为空！");
        PatientMedicareCardDO card = makeCardInfo(patientCode,idcard,medicareCardNumber);
        card.setParentType(PatientMedicareCardDO.ParentType.CareCard.getType());
        card.setType(PatientMedicareCardDO.Type.MedicareCard.getType());
        card.setCityCode(cityCode);
        this.save(card);
    }
@@ -93,7 +100,7 @@ public class PatientMedicareCardService extends BasePatientMedicardCardService<P
     * @param id
     */
    @Transactional(rollbackFor = Exception.class)
    public void unBindCard(@NotNull String id) {
    public void unBindCard(@NotNull Integer id) {
        Assert.notNull(id,"id不存在");
        PatientMedicareCardDO card = basePatientMedicareCardDao.findOne(id);
        if(null == card){
@@ -122,7 +129,8 @@ public class PatientMedicareCardService extends BasePatientMedicardCardService<P
                "LEFT JOIN base_patient patient ON card.patient_code = patient.id " +
                "WHERE " +
                " card.patient_code = '"+ patientCode +"' " +
                "AND card.type = " + type ;
                "AND card.type = " + type +
                "AND card.del = '1'";
        List<Map<String,Object>> cards = jdbcTemplate.queryForList(sql);
        if(CollectionUtils.isEmpty(cards)){
            throw new PatientCardNotFoundException("卡片不存在！");
@@ -147,7 +155,8 @@ public class PatientMedicareCardService extends BasePatientMedicardCardService<P
                " patient_medicare_card card " +
                " LEFT JOIN base_org org ON card.org_code = org.`code` " +
                " WHERE" +
                " card.patient_code = '"+ patientCode + "'";
                " card.patient_code = '"+ patientCode + "'" +
                " and card.del = '1'";
        List<Map<String,Object>> cardlist = jdbcTemplate.queryForList(sql);
        try {
            result = JavaBeanUtils.getInstance().mapListJson(cardlist);
@@ -157,9 +166,15 @@ public class PatientMedicareCardService extends BasePatientMedicardCardService<P
        return result;
    }
    public List queryCardOrgSortedList(String saasid) throws Exception {
    /**
     * 获取医院拼音首字母A-Z排序
     * @param saasid
     * @return
     * @throws Exception
     */
    public JSONObject queryOrgSortedList(String saasid) throws Exception {
        Assert.notNull(saasid,"租户id不可为空！");
        List result = new ArrayList();
        JSONObject result = new JSONObject();
        String sql = "SELECT " +
                " org.code, " +
                " org.name " +
@@ -169,10 +184,47 @@ public class PatientMedicareCardService extends BasePatientMedicardCardService<P
                " WHERE " +
                " bos.saasid = '"+ saasid + "'";
        List<Map<String,Object>> orglist = jdbcTemplate.queryForList(sql);
        Map<String,Object> map = PinYinUtil.pingYinSort(orglist);
        List tempList = new ArrayList();
        tempList.add(map);
        result = JavaBeanUtils.getInstance().mapListJson(tempList);
        result.put("sorted",PinYinUtil.pingYinSortReturnJSON(orglist));
        result.put("unsorted",orglist);
        return result;
    }
    /**
     * 获取省份拼音首字母A-Z排序
     * @return
     * @throws Exception
     */
    public JSONObject queryProvinceSortedList() throws Exception {
        JSONObject result = new JSONObject();
        String sql = "SELECT code,name from base_province";
        List<Map<String,Object>> orglist = jdbcTemplate.queryForList(sql);
        result.put("unsorted",orglist);
        result.put("sorted",PinYinUtil.pingYinSortReturnJSON(orglist));
        return result;
    }
    /**
     * 获取城市拼音首字母A-Z排序
     * @param provinceCode
     * @return
     * @throws Exception
     */
    public JSONObject queryCitySortedList(String provinceCode) throws Exception {
        JSONObject result = new JSONObject();
        String sql = "select  " +
                " city.code, " +
                " city.name, " +
                " getFirstHanZiCode(city.name) as FirstLetter " +
                " from  " +
                " base_city city  " +
                " GROUP BY city.name,FirstLetter;";
        List<Map<String, Object>> citylist = jdbcTemplate.queryForList(sql);
        for(Map<String, Object> city : citylist){
            Map<String,Map<String, Object>> oneLetterMap = new HashMap<>();
            oneLetterMap.put(city.get("FirstLetter").toString(),city);
        }
        result.put("unsorted", citylist);
        result.put("sorted", PinYinUtil.pingYinSortReturnJSON(citylist));
        return result;
    }
}

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/personal_Info/PatientService.java

@@ -267,14 +267,14 @@ public class PatientService extends BasePatientService<BasePatientDO, BasePatien
        patientBrief.setLiveProvinceName(patientDetail.getLiveProvinceName());
        patientBrief.setLiveCityCode(patientDetail.getLiveCityCode());
        patientBrief.setLiveCityName(patientDetail.getLiveCityName());
        patientBrief.setLiveTownCode(patientDetail.getLiveTownName());
        patientBrief.setLiveTownCode(patientDetail.getLiveTownCode());
        patientBrief.setLiveStreetCode(patientDetail.getLiveStreetCode());
        patientBrief.setLiveStreetName(patientDetail.getLiveStreetName());
        patientBrief.setAddress(patientDetail.getAddress());
        patientBrief.setCommitteeCode(patientDetail.getCommitteeCode());
        patientBrief.setCommitteeName(patientDetail.getCommitteeName());
        this.save(patientBrief);
        return patientDetail;
        return patientBrief;
    }

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/servicepackage/PackageService.java

@@ -107,7 +107,8 @@ public class PackageService {
                " p.price, " +
                " p.organization," +
                " p.organization_name AS organizationName," +
                " p.level " +
                " p.level," +
                " P.end_time AS endTime" +
                " FROM " +
                " base_service_package p " ;
                if(StringUtils.isNotBlank(labelCode)&&StringUtils.isNotBlank(labelType)){
@@ -385,17 +386,16 @@ public class PackageService {
                }else if("3".equals(familyModel)){
                    //查询已经授权，自己创建和家人相关记录
                    if(StringUtils.isNotBlank(patient)&&StringUtils.isNotBlank(operator)){
                        sql +=" AND (r.operator = '"+operator+"' " +
                                " OR r.patient = '"+patient+"' )";
                        sql +=" AND r.patient = '"+patient+"'";
                    }
                }
                if(status != null){
                    sql +=" AND r.`status` ="+status;
                }
                if(StringUtils.isNotBlank(isHos)){
                    sql +=" AND r.`status` < 0 ";
                    sql +=" AND r.`status` < -1 ";
                }else{
                    sql +=" AND r.`status` >= 0 ";
                    sql +=" AND r.`status` >= -1 ";
                }
                if(StringUtils.isNotBlank(label)&&StringUtils.isNotBlank(labelType)){
@@ -434,7 +434,9 @@ public class PackageService {
                " r.create_time AS createTime," +
                " r.sort," +
                " p.introduce, " +
                " p.end_introduce AS endIntroduce " +
                " p.end_introduce AS endIntroduce," +
                " r.cancel_reason," +
                " r.review_reason " +
                " FROM " +
                " base_service_package_sign_record r  " +
                " JOIN base_service_package p ON r.service_package_id = p.id " +

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/settings/HelpCenterService.java

@@ -1,9 +1,21 @@
package com.yihu.jw.patient.service.settings;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.netflix.discovery.converters.Auto;
import com.yihu.jw.entity.base.patient.HelpCenterDO;
import com.yihu.jw.patient.dao.settings.HelpCenterDao;
import com.yihu.jw.patient.exception.settings.HelpCenterQesNotFoundException;
import com.yihu.jw.patient.util.ConstantUtils;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.Assert;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * 
@@ -19,4 +31,71 @@ import org.springframework.stereotype.Service;
 */
@Service
public class HelpCenterService extends BaseJpaService<HelpCenterDO, HelpCenterDao> {
    @Autowired
    private HelpCenterDao helpCenterDao;
    /**
     * 根据问题的类型寻找答案
     * @param parentType
     * @param type
     * @return
     */
    public JSONArray getAnswerByType(String parentType, String type){
        JSONArray resultArray = new JSONArray();
        // 查找大类的时候，先展示大类下的问题列表
        if(!StringUtils.isEmpty(parentType) && StringUtils.isEmpty(type)) {
            List<HelpCenterDO> parentQuestionList = new ArrayList<>();
            parentQuestionList = helpCenterDao.findByParentType(parentType);
            for(HelpCenterDO answerForParentquestion : parentQuestionList){
                JSONObject answer = new JSONObject();
                answer.put("id",answerForParentquestion.getId());
                answer.put("parentType",answerForParentquestion.getParentType());
                answer.put("type",answerForParentquestion.getType());
                answer.put("answer",answerForParentquestion.getQuestion());
                resultArray.add(answer);
            }
            return resultArray;
        }else if(!StringUtils.isEmpty(parentType) && !StringUtils.isEmpty(type)){
            HelpCenterDO concreteAnswer = new HelpCenterDO();
            concreteAnswer = helpCenterDao.findByParentTypeAndType(parentType,type);
            JSONObject answer = new JSONObject();
            answer.put("id",concreteAnswer.getId());
            answer.put("parentType",concreteAnswer.getParentType());
            answer.put("type",concreteAnswer.getType());
            answer.put("answer",concreteAnswer.getAnswer());
            resultArray.add(answer);
            return resultArray;
        }else{
            // 所有问题大类描述展示
            HelpCenterDO questionBrief = new HelpCenterDO();
            questionBrief = helpCenterDao.findByParentTypeAndType("0","0");
            JSONObject answer = new JSONObject();
            answer.put("id",questionBrief.getId());
            answer.put("parentType",questionBrief.getParentType());
            answer.put("type",questionBrief.getType());
            answer.put("answer",questionBrief.getQuestion());
            resultArray.add(answer);
            return resultArray;
        }
    }
    /**
     * 反馈问题是否有用
     * @param questionId
     * @param usefulOrNot
     */
    public String commentAnswer(int questionId,boolean usefulOrNot){
        HelpCenterDO question = helpCenterDao.findOne(questionId);
        if(null == question){
            throw new HelpCenterQesNotFoundException("该问题不存在！");
        }
        if(usefulOrNot){
            question.setUsefulCount(question.getUsefulCount()+1);
        }else{
            question.setUnusefulCount(question.getUnusefulCount()+1);
        }
        this.save(question);
        return ConstantUtils.SUCCESS;
    }
}

svr/svr-patient/src/main/java/com/yihu/jw/patient/service/wechat/WechatPayService.java

@@ -0,0 +1,145 @@
package com.yihu.jw.patient.service.wechat;
import com.yihu.jw.entity.base.servicePackage.ServicePackageSignRecordDO;
import com.yihu.jw.entity.base.wx.WxPayLogDO;
import com.yihu.jw.entity.base.wx.WxWechatDO;
import com.yihu.jw.patient.dao.servicepackage.ServicePackageSignRecordDao;
import com.yihu.jw.rm.patient.PatientRequestMapping;
import com.yihu.jw.util.common.XMLUtil;
import com.yihu.jw.util.wechat.WeiXinPayUtils;
import com.yihu.jw.wechat.dao.WechatDao;
import com.yihu.jw.wechat.dao.WxPayLogDao;
import com.yihu.jw.wechat.service.WxPayLogService;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class WechatPayService {
    @Autowired
    private WechatDao wechatDao;
    @Autowired
    private ServicePackageSignRecordDao servicePackageSignRecordDao;
    @Autowired
    private WxPayLogService wxPayLogService;
    @Autowired
    private WxPayLogDao wxPayLogDao;
    /**
     * 微信统一下单接口
     *
     * @throws Exception
     */
    @Transactional(rollbackFor = Exception.class)
    public Map<String,Object> unifiedorder(Map<String,String> par,String appKey) throws Exception {
        String xml = WeiXinPayUtils.getXmlBeforUnifiedorder(par, appKey);
        Map<String, Object> map = WeiXinPayUtils.unifiedorder(xml,true);
        //创建日志记录
        wxPayLogService.createLog(par,xml,map);
        map.remove("wxPayResult");
        return map;
    }
    /**
     * 微信下单 服务包下单
     * @param wxId
     * @param openid
     * @param ip
     * @param orderId  服务包id
     */
    @Transactional(rollbackFor = Exception.class)
    public Map<String,Object> unifiedorder(String wxId, String openid, String ip, String orderId) throws Exception {
        Map<String, String> map = new HashMap<>();
        WxWechatDO wxWechat = wechatDao.findOne(wxId);
        if(wxWechat==null){
            throw new Exception("can't find wechat:the wxId is "+wxId);
        }
        String url = wxWechat.getBaseUrl();
        if(StringUtils.isBlank(url)){
            throw new Exception("wechat url is null:the wechatId is "+wxId);
        }
        String mchId = wxWechat.getMchId();
        if(StringUtils.isBlank(mchId)){
            throw new Exception("can't find mch_id from wecht: the wxId is "+wxId);
        }
        String appKey = wxWechat.getAppKey();
        if(StringUtils.isBlank(appKey)){
            throw new Exception("can't find app_key from wecht: the wxId is "+wxId);
        }
        ServicePackageSignRecordDO spsr = servicePackageSignRecordDao.findOne(orderId);
        if(spsr == null){
            throw new Exception("can't find ServicePackageSignRecor by "+orderId);
        }
        //拼接商品名
        String body ="";
        String hospitalName = spsr.getHospitalName();
        if(StringUtils.isNotBlank(hospitalName)){
            body += hospitalName +"-";
        }
        String servicePackageName = spsr.getServicePackageName();
        if(StringUtils.isEmpty(servicePackageName)){
            servicePackageName = "服务包";
        }
        body += servicePackageName;
        //需要支付的总金额
        Long price = spsr.getPrice();
        if(price == null){
            throw new Exception("the price is not correct,the base_service_package_sign_record is "+orderId);
        }
        long pric = price * 100;
        map.put("appid",wxWechat.getAppId());
        map.put("mch_id",wxWechat.getMchId());
        map.put("body",body);
        map.put("trade_type","JSAPI");
        map.put("spbill_create_ip",ip);
        map.put("out_trade_no",orderId);
        map.put("total_fee",pric+"");
        map.put("openid",openid);
        map.put("notify_url",url+PatientRequestMapping.WechatPay.PRE_URL+PatientRequestMapping.WechatPay.Notify);
        return unifiedorder(map,appKey);
    }
    public Map<String,String> getWxPayResultNotify(String result) {
        Map<String,String> rs = new HashedMap();
        Map<String,Object> wxrs =  XMLUtil.xmltoMap(result);
        if("SUCCESS".equals(wxrs.get("return_code").toString())){
            // 我方 订单号+时间差
            String seqNo = wxrs.get("out_trade_no")+"";
            // 微信充值流水号
            String wxSeqNo = wxrs.get("transaction_id")+"";
            // 微信分配的终端设备号
            String wxDeviceInfo = wxrs.get("device_info")+"";
            //更改业务状态,做日志保存等操作
            ServicePackageSignRecordDO spsr = servicePackageSignRecordDao.findOne(seqNo);
            spsr.setStatus(2);
            servicePackageSignRecordDao.save(spsr);
            //操作微信日志表记录
            List<WxPayLogDO> wxPayLogDOs = wxPayLogDao.findBySeqNo(seqNo);
            WxPayLogDO wxPayLogDO = wxPayLogDOs.get(0);
            wxPayLogDO.setPayResponse(result);
            wxPayLogDO.setPayStatus(1);
            wxPayLogDO.setPayTime(new Date());
            wxPayLogDO.setPayStatus(1);
            wxPayLogService.save(wxPayLogDO);
            rs.put("code","1");
            rs.put("message","支付成功");
        }else{
            rs.put("code","-1");
            rs.put("return_msg","FAIL");
        }
        return rs;
    }
}

svr/svr-patient/src/main/java/com/yihu/jw/patient/util/PinYinUtil.java

@@ -1,5 +1,7 @@
package com.yihu.jw.patient.util;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.google.common.collect.Lists;
import net.sourceforge.pinyin4j.PinyinHelper;
import net.sourceforge.pinyin4j.format.HanyuPinyinCaseType;
@@ -26,8 +28,9 @@ public class PinYinUtil {
        try {
            br = new BufferedReader(new InputStreamReader(resource.getInputStream(), "GBK"));
            String line = null;
            // 读取的文件末尾如果没有内容，不要留空行，空行也会被读
            while (null != (line = br.readLine())) {
                if (!StringUtils.startsWith(line, "#")) {
                if (!StringUtils.isEmpty(line) && !StringUtils.startsWith(line, "#")) {
                    String oneLine = line;
                    String[] lineArr = oneLine.split("=");
                    for (String key : lineArr[1].split("/")) {
@@ -63,8 +66,18 @@ public class PinYinUtil {
            try {
                String[] temp = PinyinHelper.toHanyuPinyinStringArray(arr[0], defaultFormat);
                // 长度大于1，表明是多音字，往后多取一个字或两个字，取词组，取匹配多音字属性文件确定最终读音
                if (temp != null && temp.length > 1) {
                    pybf.append(getOrgNameMultiTone(chinese).charAt(0));
                if (temp != null && temp.length > 1 && !temp[0].equalsIgnoreCase(temp[1])) {
                    String finalLetter = getOrgNameMultiTone(chinese);
                    if(StringUtils.isEmpty(finalLetter)){
                        System.out.print(arr[0]);
                        System.out.print(arr[1]+":[");
                        for(int i=0; i< temp.length-1; i++)
                            System.out.print(temp[i]+", ");
                        System.out.println(temp[temp.length-1]+"]");
                        pybf.append(temp[0].charAt(0));
                    }else{
                        pybf.append(finalLetter.charAt(0));
                    }
                } else {
                    pybf.append(temp[0].charAt(0));
                }
@@ -159,6 +172,39 @@ public class PinYinUtil {
        return map;
    }
    /**
     * 字符串按拼音排序，返回JSONObject，适合前端插件需要的格式
     *
     * @param
     * @return
     */
    public static JSONArray pingYinSortReturnJSON(List<Map<String, Object>> waitForSortingList) {
        JSONArray resultArray = new JSONArray();
        String[] alphatables = {"A", "B", "C", "D", "E", "F", "G", "H", "I",
                "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"};
        if (waitForSortingList.size() > 0) {
            for (String alpha : alphatables) {
                List<Map<String,Object>> resultList = new ArrayList<>();
                JSONObject oneLetterJson = new JSONObject();
                for (Map<String, Object> one : waitForSortingList) {
                    String name = String.valueOf(one.get("name"));
                    String firstSpell = getFirstSpell(name).substring(0, 1);
                    if (alpha.equals(firstSpell)) {
                        oneLetterJson.put("title",firstSpell);
                        resultList.add(one);
                        oneLetterJson.put("items", resultList);
                    }
                }
                if(!oneLetterJson.isEmpty()){
                    resultArray.add(oneLetterJson);
                }
            }
            return resultArray;
        }
        return resultArray;
    }
    /**
     * 获取医院多音字的读音，取词组，最多取三个
     *

svr/svr-patient/src/main/resources/application.yml

@@ -109,7 +109,7 @@ jw:
myFamily:
  qrCodeFailurTime: 7
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段
  id: 97ed8a0a-4f07-4b85-ab02-b716c611a464  # base库中,wx_wechat 的id字段
# 短信验证码发送的客户端标识,居民端
sms:
  clientId: EwC0iRSrcP
@@ -141,7 +141,7 @@ spring:
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段
  id: 97ed8a0a-4f07-4b85-ab02-b716c611a464  # base库中,wx_wechat 的id字段
# 短信验证码发送的客户端标识,居民端
sms:
  clientId: EwC0iRSrcP

svr/svr-patient/src/main/resources/multitone.properties

@@ -0,0 +1,47 @@
###此属性文件，只放一些医院名称可能会用到的多音字的词组，其他的不存，后期如果有新的多音字发现，需手动添加到此文件并维护
######### A ##########
A=阿/阿克/阿拉
######### B ##########
BANG=蚌埠
BAI=百
######### C ##########
CHAO=朝阳/长
CHONG=重庆
CHANG=长治/长春
######### D ##########
DA=大/大同
######### F ##########
F=佛
######### G ##########
GUANG=广/广东/广西
######### H ##########
HONG=红河
HE=合肥
######### J ##########
J=景
######### K ##########
KA=喀什
######### L ##########
L=漯/六/乐
######### M ##########
######### N ##########
NA=那/那曲
NAN=南
######### P ##########
######### Q ##########
QI=齐齐
######### R ##########
######### S ##########
SHENG=省/省人民/省政府
SHI=石/石嘴山
SHEN=沈阳
SU=宿
######### T ##########
T=塔城
######### W ##########
WU=无锡
######### X ##########
XIA=厦门/厦大
X=信
######### Y ##########
Y=烟

svr/svr-statistics/src/main/java/com/yihu/wlyy/Application.java

@@ -38,7 +38,7 @@ public class Application {
     * request [/strategy/list/] as the response has already been committed. As a
     * result, the response may have the wrong status code. If your application is
     * running on WebSphere Application Server you may be able to resolve this
     * problem by setting com.ibm.ws.webcontainer.invokeFlushAfterService to false
     * problem by settings com.ibm.ws.webcontainer.invokeFlushAfterService to false
     */
    @Bean
    public ErrorPageFilter errorPageFilter() {

svr/svr-statistics/src/main/resources/application.yml

@@ -43,7 +43,7 @@ spring:
      max-active: 8 # Max number of connections that can be allocated by the pool at a given time. Use a negative value for no limit.
      max-idle: 8 # Max number of "idle" connections in the pool. Use a negative value to indicate an unlimited number of idle connections.
      max-wait: -1 # Maximum amount of time (in milliseconds) a connection allocation should block before throwing an exception when the pool is exhausted. Use a negative value to block indefinitely.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This setting only has an effect if it is positive.
      min-idle: 1 # Target for the minimum number of idle connections to maintain in the pool. This settings only has an effect if it is positive.
multipart:

svr/svr-wlyy-specialist/src/main/resources/application.yml

@@ -183,9 +183,9 @@ spring:
    username: wlyy
    password: jkzlehr@123
  redis:
    host: 27.155.101.77 # Redis server host.
    port: 6380 # Redis server port.
    password: jkzl_ehr
    host: 59.61.92.90 # Redis server host.
    port: 9054 # Redis server port.
    password: jkzlehr
fastDFS:
  fastdfs_file_url: http://172.19.103.54:80/