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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/prescription/PrescriptionPayDao.java

@@ -17,6 +17,6 @@ public interface PrescriptionPayDao extends PagingAndSortingRepository<Prescript
    PrescriptionPay findByPrescriptionPay(String prescriptionCode);
    //查询支付记录
    @Query("from PrescriptionPay p where p.prescriptionCode=?1 ")
    PrescriptionPay findByCode(String prescriptionCode);
    @Query("from PrescriptionPay p where p.code=?1 ")
    PrescriptionPay findByCode(String code);
}

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

@@ -83,9 +83,9 @@ public class PrescriptionInfoService extends BaseService {
    private StringRedisTemplate redisTemplate;
    @Autowired
    private PresModeAdapter presModeAdapter;
    //健康问题 高血压
    private static final String gxy = "HP0093";
    //健康问题 糖尿病
    private static final String tnb ="HP0047";
    private static final Logger logger = LoggerFactory.getLogger(HttpUtil.class);
@@ -538,9 +538,7 @@ public class PrescriptionInfoService extends BaseService {
            prescriptionLogDao.save(log);
            //同步智业接口,前往开方
            upLoadPrescriotionState(state,p,reviewed);
            return 1;
            return upLoadPrescriotionState(state,p,reviewed);
        }
        return 0;
@@ -1079,8 +1077,15 @@ public class PrescriptionInfoService extends BaseService {
     * @return
     */
   public JSONArray getRegisterRee(String jwHospital,String jwDoctorCode){
        StringBuffer sql = new StringBuffer(" SELECT t.register_fee AS registerFee,t.register_type AS t.registerType,t.register_type_name AS registerTypeName FROM zy_iv_staff_reg_type_allot_dict t " +
                " WHERE t.org_code =? AND t.staff_code =? ");
       StringBuffer sql = new StringBuffer("SELECT " +
               " t.register_fee AS registerFee," +
               " t.register_type AS registerType," +
               " t.register_type_name AS registerTypeName " +
               " FROM" +
               " zy_iv_staff_reg_type_allot_dict t" +
               " WHERE" +
               " t.org_code =？ " +
               " AND t.staff_code =？");
       List<Map<String,Object>> rs = jdbcTemplate.queryForList(sql.toString(),new Object[]{jwHospital,jwDoctorCode});
       return new JSONArray(rs);
   }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/prescription/PrescriptionInfoController.java

@@ -97,7 +97,12 @@ public class PrescriptionInfoController extends BaseController{
                                     @RequestParam(required = false)@ApiParam(value = "诊金", name = "registerFee")String registerFee,
                                     @RequestParam(required = false)@ApiParam(value = "诊金类型", name = "rateTypeCode")String rateTypeCode){
        try {
            return write(200, "查询成功！", "data",prescriptionInfoService.reviewPrescription(code,reason,state,dept,registerFee,rateTypeCode));
            int rs = prescriptionInfoService.reviewPrescription(code,reason,state,dept,registerFee,rateTypeCode);
            if(rs==0){
                return write(200, "开方失败！", "data",rs);
            }else{
                return write(200, "成功提交开方", "data",rs);
            }
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败！");

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

@@ -96,8 +96,8 @@ public class PatientPrescriptionPayController extends WeixinBaseController {
    public String chargeQuery(@RequestParam(required = true) @ApiParam(value = "支付应用流水号", name = "outChargeNo") String outChargeNo) throws Exception {
        try {
            String accessToken = getAccessToken();
            payService.chargeQuery(outChargeNo, accessToken);
            return write(200, "获取成功！");
            String result = payService.chargeQuery(outChargeNo, accessToken);
            return write(200, "获取成功！","data",result);
        } catch (Exception e) {
            return error(-1, "获取失败！");
        }

patient-co/patient-co-wlyy/src/main/resources/application.yml

@@ -138,7 +138,7 @@ wechat:
   #问卷调查
   template_doctor_survey:  OqQXrb-e43_TJpq_70_K_y6vYJgY5mpjFYY4c5RWFP4
   #审核结果通知
   template_doctor_audit:  OFyLUeBW3r9trWw-i6pbB1sPSTD4J2recCv_mc-gKxA
   template_doctor_audit:  lCtOgJgL1tBJbAytqN7cn-FgCH_Usg99FENEy2TrC08
   #服务结果通知
   template_doctor_service:  i34rq3xFLnpf_VN2Jor9n2YlQqJMM7oXyYvuctriISw
@@ -237,9 +237,9 @@ wechat:
   #问卷调查
   template_doctor_survey:  8ZWKJmoJ7VR7Uk4YS7aa0Z94QzCkxsyTW6R4CHhUJII
   #审核结果通知
   template_doctor_audit:  OFyLUeBW3r9trWw-i6pbB1sPSTD4J2recCv_mc-gKxA
   template_doctor_audit:  egrX5Larpkv8opQW67_hwsZoT0OHwwUpE1v7HeU_Jnw
   #服务结果通知
   template_doctor_service:  i34rq3xFLnpf_VN2Jor9n2YlQqJMM7oXyYvuctriISw
   template_doctor_service:  xhi1LEudiZwJfZylOHuZNo8EiA73GtSshPQv5XOt9Lk
yihu:
@@ -436,7 +436,7 @@ wechat:
    #问卷调查
    template_doctor_survey:  OqQXrb-e43_TJpq_70_K_y6vYJgY5mpjFYY4c5RWFP4
    #审核结果通知
    template_doctor_audit:  OFyLUeBW3r9trWw-i6pbB1sPSTD4J2recCv_mc-gKxA
    template_doctor_audit:  lCtOgJgL1tBJbAytqN7cn-FgCH_Usg99FENEy2TrC08
    #服务结果通知
    template_doctor_service: i34rq3xFLnpf_VN2Jor9n2YlQqJMM7oXyYvuctriISw