Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

common/common-entity/src/main/java/com/yihu/wlyy/entity/patient/prescription/Prescription.java

@@ -77,6 +77,11 @@ public class Prescription extends IdEntity {
    private String reviewedState;
    private String jwDeptCode;  //基卫-开处方的科室编码
    private String jwDoctorCode; //基卫-开方医生的编码
    private String jwGisterTypeCode;//基卫-挂号类型编码
    private String jwRateCode;//基卫-费别类型编码
    @Column(name = "code", unique = true, nullable = false)
    public String getCode() {
        return code;
@@ -566,4 +571,36 @@ public class Prescription extends IdEntity {
    public void setReviewedState(String reviewedState) {
        this.reviewedState = reviewedState;
    }
    public String getJwDeptCode() {
        return jwDeptCode;
    }
    public void setJwDeptCode(String jwDeptCode) {
        this.jwDeptCode = jwDeptCode;
    }
    public String getJwDoctorCode() {
        return jwDoctorCode;
    }
    public void setJwDoctorCode(String jwDoctorCode) {
        this.jwDoctorCode = jwDoctorCode;
    }
    public String getJwGisterTypeCode() {
        return jwGisterTypeCode;
    }
    public void setJwGisterTypeCode(String jwGisterTypeCode) {
        this.jwGisterTypeCode = jwGisterTypeCode;
    }
    public String getJwRateCode() {
        return jwRateCode;
    }
    public void setJwRateCode(String jwRateCode) {
        this.jwRateCode = jwRateCode;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/config/SwaggerConfig.java

@@ -93,6 +93,7 @@ public class SwaggerConfig {
                        regex("/manage_util/.*"),
                        regex("/common/.*"),
                        regex("/hospitals/.*"),
                        regex("/index/.*"),
                        regex("/upload/.*"),
                        regex("/weixin/.*"),
                        regex("/wx/.*"),

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/config/security/WebSecurityConfig.java

@@ -5,6 +5,7 @@ package com.yihu.wlyy.config.security;
        import org.springframework.context.annotation.Configuration;
        import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
        import org.springframework.security.config.annotation.web.builders.HttpSecurity;
        import org.springframework.security.config.annotation.web.builders.WebSecurity;
        import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
        import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
@@ -20,6 +21,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
    @Value("${security.basic.password}")
    String password;
    protected void configure(HttpSecurity http) throws Exception {
        http.authorizeRequests()
                .antMatchers("/swagger-ui.html").authenticated()

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PatientPrescriptionPayService.java

@@ -26,6 +26,7 @@ import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.repository.prescription.*;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.service.third.httplog.LogService;
import com.yihu.wlyy.service.third.jw.JwPrescriptionService;
import com.yihu.wlyy.service.weixin.wxpay.common.Configure;
import com.yihu.wlyy.service.weixin.wxpay.model.BindCard;
import com.yihu.wlyy.service.weixin.wxpay.model.Charge;
@@ -119,6 +120,8 @@ public class PatientPrescriptionPayService extends BaseService {
    private PrescriptionInfoService infoService;
    @Autowired
    private PushMsgTask pushMsgTask;
    @Autowired
    private JwPrescriptionService jwPrescriptionService;
    /**
     * 长处方配送信息查询接口
@@ -512,7 +515,8 @@ public class PatientPrescriptionPayService extends BaseService {
                            message.setCzrq(new Date());
                            messageDao.save(message);
                        }
                       //支付成功发起结算
                        jwPrescriptionService.executeSickSettle(prescriptionCode);
                    } else if ("1".equals(tradeStatus)) {
                        prescriptionPay.setTradeStatus("0");//交易状态 成功1 失败0
                        prescription.setStatus(21);////续费状态 30支付成功 21支付失败

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionService.java

@@ -146,7 +146,7 @@ public class PrescriptionService extends BaseService {
        // "bcghcs":"本次挂号次数","ghksmc":"挂号科室名称","cfxms0":"明细上传数量","mzlsh0":"医保挂号流水号 如果为空，将自动医保挂号并收费","ghfy00":"挂号费用",
        // "yszjdj":"医师诊金级别","bqbm00":"病情编码","sfygwd":"是否医改网点"}
        JSONObject jsonObject = new JSONObject();
        jsonObject.put("yyksbm","医生科室编码");//医生科室编号-------------------------待处理
        jsonObject.put("yyksbm",prescription.getJwDeptCode());//医生科室编号
        jsonObject.put("bcsfcs",1);//本次收费次数
        jsonObject.put("yszjhm",doctorMapping.getJwDocotrIdcard());//医生证件号码
//        jsonObject.put("yszjhm","350681876766545567");//医生证件号码
@@ -155,7 +155,7 @@ public class PrescriptionService extends BaseService {
        jsonObject.put("mzlb00",101);//门诊类别---普通门诊默认为101
        jsonObject.put("sfydgh","N");//是否药店挂号，默认为N，不是药店挂号
        jsonObject.put("bcghcs",1);//本次挂号次数
        jsonObject.put("ghksmc","挂号科室名称");//挂号科室名称--------------------------待处理
        jsonObject.put("ghksmc",prescription.getDeptName());//挂号科室名称
        jsonObject.put("mzlsh0","");//医保挂号流水号
        jsonObject.put("ghfy00",0);//挂号费用
        jsonObject.put("yszjdj","医师诊金级别");//医师诊金级别--------------------------待处理

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jw/ZyDictService.java

@@ -72,19 +72,11 @@ public class ZyDictService {
     * @return
     */
    public List<Map<String, Object>> findDictByDoctorAndName(String doctor,String name){
        String sql = "select " +
                        "p.physic_code drugCode," +
                        "p.physic_name drugName," +
                        "p.physic_spec drugFormat" +
                        " from zy_iv_physic_dict p," +
                        " (SELECT o.physic_code" +
                        "   ,o.org_code " +
                        "   from " +
                        "       wlyy_doctor_mapping h," +
                        "       zy_iv_org_physic_allot_dict o" +
                        "   WHERE o.org_code = h.jw_doctor_hospital " +
                        "   and h.doctor_code = ?) ho" +
                        " WHERE ho.physic_code = p.physic_code";
        String sql = "SELECT yp.physic_code drugCode,yp.physic_name drugName,yp.physic_spec drugFormat,yp.subject_class subjectClass,yp.dose_unit physicDoseUnit, " +
                " com1.`name`physicDoseUnitName,yp.quantity_unit drugNumUnit,com2.`name`drugNumUnitName FROM zy_common_dict com1,zy_common_dict com2,(SELECT p.physic_code, " +
                " p.physic_name,p.physic_spec,p.subject_class,p.dose_unit,p.quantity_unit,class.class_name FROM zy_iv_subject_class_dict class,zy_iv_physic_dict p, " +
                " (SELECT o.physic_code,o.org_code FROM wlyy_doctor_mapping h,zy_iv_org_physic_allot_dict o WHERE o.org_code=h.jw_doctor_hospital AND h.doctor_code=? " +
                " )ho WHERE ho.physic_code=p.physic_code AND class.class_code=p.subject_class  " ;
        if(StringUtils.isNotBlank(name)){
            if(isEnglish(name)){
                sql += " and p.spell_code like '%"+name.toUpperCase()+"%'";
@@ -92,6 +84,7 @@ public class ZyDictService {
                sql += " and p.physic_name like '%"+name+"%'";
            }
        }
        sql +=" )yp WHERE com1.dict_name='IV_MEASURE_UNIT_DICT'AND com1.`code`=yp.dose_unit AND com2.dict_name='IV_MEASURE_UNIT_DICT'AND com2.`code`=yp.quantity_unit;";
//        subjectClass
//        drugNumUnit":"224","drugNumUnitName":"支",
//        physicDoseUnit":"224","physicDoseUnitName":"支",

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

@@ -3,6 +3,8 @@ package com.yihu.wlyy.web;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.wlyy.entity.IdEntity;
import com.yihu.wlyy.util.DateUtil;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -16,6 +18,13 @@ import javax.servlet.http.HttpServletRequest;
import java.lang.reflect.Field;
import java.util.*;
@ApiResponses(value = {
        @ApiResponse(code = 200, message = "返回的json里的status是200，成功"),
        @ApiResponse(code = 403, message = "返回的json里的status是403，该操作没有权限"),
        @ApiResponse(code = 997, message = "返回的json里的status是997，重新登陆"),
        @ApiResponse(code = 998, message = "返回的json里的status是998，登录超时，请重新登录"),
        @ApiResponse(code = 999, message = "返回的json里的status是999，帐号在别处登录，请重新登录")
})
public class BaseController {
    private static Logger logger = LoggerFactory.getLogger(BaseController.class);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/system/SystemDictController.java

@@ -3,9 +3,8 @@ package com.yihu.wlyy.web.common.system;
import com.yihu.wlyy.entity.dict.SystemDict;
import com.yihu.wlyy.service.system.SystemDictService;
import com.yihu.wlyy.web.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.yihu.wlyy.web.manager.Index;
import io.swagger.annotations.*;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
@@ -49,4 +48,13 @@ public class SystemDictController extends BaseController {
            return error(-1, "验证码检查失败！");
        }
    }
    @RequestMapping(value = "/test",method = RequestMethod.GET)
    @ApiOperation("测试方法")
    @ResponseBody
    public Index index(
            @ApiParam(name="name",required = false,value = "参数") @RequestParam(required = false,name = "name") String name
    ) {
        return new Index();
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/manager/Index.java

@@ -0,0 +1,24 @@
package com.yihu.wlyy.web.manager;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
/**
 * Created by chenweida on 2017/8/12.
 */
@ApiModel("index实体类")
public class Index {
    @ApiModelProperty(value = "名称",required =false,access = "response")
    private String name;
    @ApiModelProperty(value = "名称",required =false,access = "response")
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
}