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/service/weixin/wxpay/service/OnePayService.java

@@ -32,6 +32,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.PageRequest;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -47,6 +48,9 @@ import java.util.*;
@Service
@Transactional
public class OnePayService {
    
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private PayConfiguraDao configuraDao;
@@ -329,8 +333,8 @@ public class OnePayService {
                Doctor doctor = doctorDao.findByCode(signDoctorCode);
                Patient user = patientDao.findByCode(people);
                Map<String, String> familyContent = new HashMap<>();
    
                JSONObject familyContent =  new JSONObject();
                String moregNo = format.format(new Date()) + uuid.substring(0, 6);
                familyContent.put("moRegNo", moregNo);//医院签约号限长20  signFamily code
                familyContent.put("moRegName", signFamily.getName()); //签约人姓名
@@ -350,7 +354,102 @@ public class OnePayService {
                familyContent.put("moBookOrgNo", sbCode);//登记机构 签约机构
                familyContent.put("moBookerNo", signFamily.getSignDoctorName()); //登记人 签约医生姓名
                familyContent.put("moBookTime", format.format(signFamily.getBegin())); //登记时间 签约时间
                params.put("familyContent", objectMapper.writeValueAsString(familyContent));// 家庭医生签约信息
    
                JSONObject moServiceType = new JSONObject();//服务类型
    
                List<String> signTypes = jdbcTemplate.queryForList("SELECT s.server_type FROM wlyy_sign_family_server s WHERE s.sign_code ='"+signFamily.getCode()+"'", String.class);
                
                if(signTypes !=null && !signTypes.isEmpty()){
                    
                    if(signTypes.contains("1")){//普通人
                        moServiceType.put("fwlx00_pt",1);
                    }else{
                        moServiceType.put("fwlx00_pt",0);
                    }
    
                    if(signTypes.contains("3")){// 老年人
                        moServiceType.put("fwlx00_lnr",1);
                    }else{
                        moServiceType.put("fwlx00_lnr",0);
                    }
    
                    if(signTypes.contains("4")){// 高血压
                        moServiceType.put("fwlx00_gxy",1);
                    }else{
                        moServiceType.put("fwlx00_gxy",0);
                    }
    
                    if(signTypes.contains("5")){// 糖尿病
                        moServiceType.put("fwlx00_tnb",1);
                    }else{
                        moServiceType.put("fwlx00_tnb",0);
                    }
    
                    if(signTypes.contains("6")){// 孕产妇
                        moServiceType.put("fwlx00_ycf",1);
                    }else{
                        moServiceType.put("fwlx00_ycf",0);
                    }
    
                    if(signTypes.contains("7")){// 儿童
                        moServiceType.put("fwlx00_rt",1);
                    }else{
                        moServiceType.put("fwlx00_rt",0);
                    }
    
                    if(signTypes.contains("8")){// 贫困人口
                        moServiceType.put("fwlx00_pkrk",1);
                    }else{
                        moServiceType.put("fwlx00_pkrk",0);
                    }
    
                    if(signTypes.contains("9")){// 计生特殊家庭
                        moServiceType.put("fwlx00_jsts",1);
                    }else{
                        moServiceType.put("fwlx00_jsts",0);
                    }
    
                    if(signTypes.contains("10")){// 重性精神疾病
                        moServiceType.put("fwlx00_zxjs",1);
                    }else{
                        moServiceType.put("fwlx00_zxjs",0);
                    }
    
                    if(signTypes.contains("11")){// 残疾人
                        moServiceType.put("fwlx00_cjr",1);
                    }else{
                        moServiceType.put("fwlx00_cjr",0);
                    }
    
                    if(signTypes.contains("12")){// 结核病
                        moServiceType.put("fwlx00_jhb",1);
                    }else{
                        moServiceType.put("fwlx00_jhb",0);
                    }
                }else{
                    moServiceType.put("fwlx00_pt",0);
                    moServiceType.put("fwlx00_lnr",0);
                    moServiceType.put("fwlx00_gxy",0);
                    moServiceType.put("fwlx00_tnb",0);
                    moServiceType.put("fwlx00_ycf",0);
                    moServiceType.put("fwlx00_rt",0);
                    moServiceType.put("fwlx00_pkrk",0);
                    moServiceType.put("fwlx00_jsts",0);
                    moServiceType.put("fwlx00_zxjs",0);
                    moServiceType.put("fwlx00_cjr",0);
                    moServiceType.put("fwlx00_jhb",0);
                }
    
                familyContent.put("moServiceType",moServiceType);//服务类型
                familyContent.put("moProvince",user.getProvinceName());//省(自治区、直辖市)
                familyContent.put("moCity",user.getCityName());//市(地区
                familyContent.put("moCounty",user.getTownName());//县(区)
                familyContent.put("moTownship",user.getStreetName());//乡(街道)
                familyContent.put("moVillage",user.getSickVillageName());//乡(街道)
                
                
                params.put("familyContent", familyContent.toString());// 家庭医生签约信息
            }
            //请求结构体
            Map<String, String> map = new HashMap<>();